Merge branch 'update_gitlab_grit' into 'master'

Update gitlab-grit

Merge branch 'update_gitlab_grit' into 'master'
Update gitlab-grit
db5f0e7e · Dmitriy Zaporozhets · 4f1c2386 · 01a097d7 · db5f0e7e
Commit db5f0e7e authored Feb 06, 2014 by Dmitriy Zaporozhets
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
@@ -167,7 +167,7 @@ GEM
      stringex (~> 1.5.1)
    gitlab-grack (2.0.0.pre)
      rack (~> 1.5.1)
-    gitlab-grit (2.6.3)
+    gitlab-grit (2.6.4)
      charlock_holmes (~> 0.6.9)
      diff-lcs (~> 1.1)
      mime-types (~> 1.15)