Merge branch 'bump-grit' into 'master'

Bump grit

Fixes gitlab/grit#7

See merge request !1166
This commit is contained in:
Dmitriy Zaporozhets
2014-10-09 14:25:51 +00:00
+1 -1
View File
@@ -168,7 +168,7 @@ GEM
multi_json
gitlab-grack (2.0.0.pre)
rack (~> 1.5.1)
gitlab-grit (2.6.11)
gitlab-grit (2.6.12)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
mime-types (~> 1.15)