Permalink
Browse files

JSON gem and ruby bumps

  • Loading branch information...
1 parent 44e9905 commit b31b383a2ba83effef20d295152a29e4bc0ef709 @Veejay Veejay committed Feb 11, 2013
Showing with 4 additions and 2 deletions.
  1. +1 −1 .ruby-version
  2. +1 −0 Gemfile
  3. +2 −1 Gemfile.lock
View
@@ -1 +1 @@
-1.9.3-p374
+1.9.3-p385
View
@@ -4,6 +4,7 @@ gem 'rails', '3.2.11'
gem 'backbone-support', '0.3.0'
gem 'bcrypt-ruby', '~> 3.0.1'
+gem 'json', '~> 1.7'
gem 'bitmask_attributes'
gem 'cancan'
gem 'coffee-filter'
View
@@ -116,7 +116,7 @@ GEM
activesupport (>= 3.0.0)
blankslate (>= 2.1.2.4)
journey (1.0.4)
- json (1.7.6)
+ json (1.7.7)
launchy (2.1.2)
addressable (~> 2.3)
libwebsocket (0.1.5)
@@ -263,6 +263,7 @@ DEPENDENCIES
haml-rails
heroku
jbuilder
+ json (~> 1.7)
memcache-client
mobile-fu
mocha

0 comments on commit b31b383

Please sign in to comment.