Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

aa1c3214 · Marin Jankovski · bbfa65ac · 96b55a0e · aa1c3214
Commit aa1c3214 authored Sep 01, 2015 by Marin Jankovski
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -462,7 +462,7 @@ GEM
    pyu-ruby-sasl (0.0.3.3)
    quiet_assets (1.0.2)
      railties (>= 3.1, < 5.0)
-    racc (1.4.10)
+    racc (1.4.12)
    rack (1.5.5)
    rack-accept (0.4.5)
      rack (>= 0.4)