diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-03-20 13:46:31 +0100 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-03-20 13:46:31 +0100 |
| commit | 9afd04842f6658dcd1dc02cda17247c321ff6a67 (patch) | |
| tree | 9499fcf26a2bc284a7b946545ad2772b868c833c /Gemfile.lock | |
| parent | 4dc09e5c1dbed7aa40209499e4d0889936bc72a1 (diff) | |
| download | gitlab-ce-9afd04842f6658dcd1dc02cda17247c321ff6a67.tar.gz | |
Update Changelog
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index dc2f920619d..167fd960ff5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -191,7 +191,7 @@ GEM charlock_holmes (~> 0.6.6) escape_utils (~> 0.2.4) mime-types (~> 1.19) - gitlab_emoji (0.0.1) + gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) gitlab_git (5.7.1) activesupport (~> 4.0.0) @@ -601,7 +601,7 @@ DEPENDENCIES gitlab-gollum-lib (~> 1.1.0) gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) - gitlab_emoji (~> 0.0.1) + gitlab_emoji (~> 0.0.1.1) gitlab_git (~> 5.7.1) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.4) |