Merge branch 'update_grit_version' into 'master'

Update grit version

Merge branch 'update_grit_version' into 'master'
Update grit version
a107776e · Marin Jankovski · da8ebbb0 · c4c2655c · a107776e
Commit a107776e authored May 14, 2014 by Marin Jankovski
Hide 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
@@ -162,7 +162,7 @@ GEM
      multi_json
    gitlab-grack (2.0.0.pre)
      rack (~> 1.5.1)
-    gitlab-grit (2.6.6)
+    gitlab-grit (2.6.7)
      charlock_holmes (~> 0.6)
      diff-lcs (~> 1.1)
      mime-types (~> 1.15)