Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

2014-02-14 01:01:37 -05:00 · 2014-02-14 01:01:37 -05:00 · 6186e20251
parent 5d8fac92c6 4d1f24e606
commit 6186e20251
1 changed files with 1 additions and 1 deletions
--- a/admin/Gemfile
+++ b/admin/Gemfile
@ -51,7 +51,7 @@ gem 'aasm', '3.0.16'
 gem 'postgres-copy', '0.6.0'
 gem 'aws-sdk', '1.29.1'
 gem 'bugsnag'
-gem 'gon', '5.0.1' # '5.0.3' has an issue with setting globals in an initializer
+gem 'gon'
 gem 'cocoon'
 gem 'haml-rails'
 gem 'resque'