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

6 years ago · 2e69416147
parent 34c3396f14 526785dd2d
commit 2e69416147
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -64,8 +64,8 @@ gem 'elasticsearch-rails'
 gem 'oauth2'
 # xlsx
-# gem 'axlsx', '3.0.0.pre'
+gem 'axlsx', '3.0.0.pre'
-# gem 'axlsx_rails', '0.3.0'
+gem 'axlsx_rails', '0.3.0'
 # state machine
 gem 'aasm'