Merge remote-tracking branch 'origin/project_pack' into project_pack

project_pack
杨树林 6 years ago
commit 2e69416147

@ -64,8 +64,8 @@ gem 'elasticsearch-rails'
gem 'oauth2'
# xlsx
# gem 'axlsx', '3.0.0.pre'
# gem 'axlsx_rails', '0.3.0'
gem 'axlsx', '3.0.0.pre'
gem 'axlsx_rails', '0.3.0'
# state machine
gem 'aasm'

Loading…
Cancel
Save