Download as
Browse Code »

Commit 3686189e286ed64b93433edef8eccafabfaad6cc

Authored by Antonio Terceiro
2 parents 34f8f4d7 3bc3acc2
Exists in master and in 8 other branches cherry-pick-62193d8b, federation, gemfile-changes, rails4, rails5, stable-1.2, stable-1.3, stable-1.5

Merge branch 'master' into stable-master

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
Gemfile.lock
  Diff comments   View file @3686189
... ... @@ -61,7 +61,7 @@ GEM
61 61 database_cleaner (1.2.0)
62 62 diff-lcs (1.1.3)
63 63 erubis (2.7.0)
64   - eventmachine (0.12.11)
  64 + eventmachine (0.12.10)
65 65 fast_gettext (0.6.8)
66 66 ffi (1.0.11)
67 67 gherkin (2.4.21)
... ...