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

This commit is contained in:
Marin Jankovski 2015-09-01 12:51:57 +02:00
commit aa1c321459

View file

@ -462,7 +462,7 @@ GEM
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
quiet_assets (1.0.2) quiet_assets (1.0.2)
railties (>= 3.1, < 5.0) railties (>= 3.1, < 5.0)
racc (1.4.10) racc (1.4.12)
rack (1.5.5) rack (1.5.5)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)