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

gitlabhq · Sep 1, 2015 · aa1c321 · aa1c321
2 parents bbfa65a + 96b55a0
commit aa1c321
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)