diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-09-01 12:51:57 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-09-01 12:51:57 +0200 |
| commit | aa1c32145914c9645818bf2b4a5cc0701bc321f2 (patch) | |
| tree | 7d258f071f1801667dc2c9da61ad76683b952fff | |
| parent | bbfa65ac30053daaba5bed520de1741fc99cd7b2 (diff) | |
| parent | 96b55a0e90464b5920a91da10357f561b64c7b4b (diff) | |
| download | gitlab-ce-aa1c32145914c9645818bf2b4a5cc0701bc321f2.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ff01ad10145..1772500d659 100644 --- 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) |