nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump json

Browse source
This commit is contained in:
Jonne Haß 2013-05-25 15:45:16 +02:00
parent 31b3100141
commit d3fe58407c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -9,7 +9,7 @@ gem 'unicorn', '4.6.2', :require => false
# API and JSON # API and JSON
gem 'acts_as_api', '0.4.1' gem 'acts_as_api', '0.4.1'
gem 'json', '1.7.7' gem 'json', '1.8.0'
# Authentication # Authentication

4
Gemfile.lock
View file

@ -188,7 +188,7 @@ GEM
jquery-ui-rails (3.0.1) jquery-ui-rails (3.0.1)
jquery-rails jquery-rails
railties (>= 3.1.0) railties (>= 3.1.0)
json (1.7.7) json (1.8.0)
jwt (0.1.8) jwt (0.1.8)
multi_json (>= 1.5) multi_json (>= 1.5)
kaminari (0.14.1) kaminari (0.14.1)
@ -444,7 +444,7 @@ DEPENDENCIES
i18n-inflector-rails (~> 1.0) i18n-inflector-rails (~> 1.0)
jasmine (= 1.3.2) jasmine (= 1.3.2)
jquery-rails (= 2.1.4) jquery-rails (= 2.1.4)
json (= 1.7.7) json (= 1.8.0)
markerb (= 1.0.1) markerb (= 1.0.1)
messagebus_ruby_api (= 1.0.3) messagebus_ruby_api (= 1.0.3)
mini_magick (= 3.6.0) mini_magick (= 3.6.0)