Permalink
Browse files

Merge remote branch 'sferik/master'

  • Loading branch information...
2 parents dd46110 + 4d06c24 commit 51d73f3d1298d595b4227110f5aa99f51b342c97 @wolframarnold wolframarnold committed Mar 14, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 spec/dummy_app/Gemfile.lock
@@ -39,7 +39,7 @@ GEM
bcrypt-ruby (2.1.4)
bcrypt-ruby (2.1.4-java)
builder (2.1.2)
- devise (1.1.7)
+ devise (1.1.8)
bcrypt-ruby (~> 2.1.2)
warden (~> 1.0.2)
erubis (2.6.6)
@@ -55,7 +55,7 @@ GEM
activerecord
activesupport
polyglot (0.3.1)
- rack (1.2.1)
+ rack (1.2.2)
rack-mount (0.6.13)
rack (>= 1.0.0)
rack-test (0.5.7)

0 comments on commit 51d73f3

Please sign in to comment.