Merge branch 'stable' into develop
This commit is contained in:
commit
9e9128f77d
1 changed files with 1 additions and 1 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue