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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-08-30 22:34:56 +02:00
commit 3cc475c887
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

@ -199,7 +199,7 @@ gem "minitest"
group :production do # we don"t install these on travis to speed up test runs group :production do # we don"t install these on travis to speed up test runs
# Administration # Administration
gem "rails_admin", "0.6.8" gem "rails_admin", "0.7.0"
# Analytics # Analytics

4
Gemfile.lock
View file

@ -599,7 +599,7 @@ GEM
rails-timeago (2.11.0) rails-timeago (2.11.0)
actionpack (>= 3.1) actionpack (>= 3.1)
activesupport (>= 3.1) activesupport (>= 3.1)
rails_admin (0.6.8) rails_admin (0.7.0)
builder (~> 3.1) builder (~> 3.1)
coffee-rails (~> 4.0) coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0, < 5) font-awesome-rails (>= 3.0, < 5)
@ -884,7 +884,7 @@ DEPENDENCIES
rails-assets-typeahead.js (= 0.11.1)! rails-assets-typeahead.js (= 0.11.1)!
rails-i18n (= 4.0.4) rails-i18n (= 4.0.4)
rails-timeago (= 2.11.0) rails-timeago (= 2.11.0)
rails_admin (= 0.6.8) rails_admin (= 0.7.0)
rb-fsevent (= 0.9.5) rb-fsevent (= 0.9.5)
rb-inotify (= 0.9.5) rb-inotify (= 0.9.5)
redcarpet (= 3.3.2) redcarpet (= 3.3.2)