Merge branch 'stable' into develop

This commit is contained in:
Jason Robinson 2015-10-10 20:45:06 +02:00
commit 9e9128f77d

View file

@ -147,7 +147,7 @@ GEM
devise_lastseenable (0.0.6)
devise
rails (>= 3.0.4)
diaspora-vines (0.2.0.develop.3)
diaspora-vines (0.2.0.develop.4)
activerecord (~> 4.1)
bcrypt (~> 3.1)
em-hiredis (~> 0.3.0)