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:
Dennis Schubert 2015-10-03 02:28:08 +02:00
commit cc631372a1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Gemfile.lock
View file

@ -147,11 +147,11 @@ GEM
devise_lastseenable (0.0.6) devise_lastseenable (0.0.6)
devise devise
rails (>= 3.0.4) rails (>= 3.0.4)
diaspora-vines (0.2.0.develop.1) diaspora-vines (0.2.0.develop.3)
activerecord (~> 4.1) activerecord (~> 4.1)
bcrypt (~> 3.1) bcrypt (~> 3.1)
em-hiredis (~> 0.3.0) em-hiredis (~> 0.3.0)
eventmachine (>= 1.0.5, < 1.1) eventmachine (~> 1.0.8)
http_parser.rb (~> 0.6) http_parser.rb (~> 0.6)
nokogiri (~> 1.6) nokogiri (~> 1.6)
diaspora_federation (0.0.8) diaspora_federation (0.0.8)
@ -443,7 +443,7 @@ GEM
mime-types (2.6.2) mime-types (2.6.2)
mini_magick (4.3.3) mini_magick (4.3.3)
mini_portile (0.6.2) mini_portile (0.6.2)
minitest (5.8.0) minitest (5.8.1)
mobile-fu (1.3.1) mobile-fu (1.3.1)
rack-mobile-detect rack-mobile-detect
rails rails