Commit ad757166 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix-gemfile-lock' into 'master'

Fix ordering in Gemfile.lock

See merge request !2541
parents bcd31001 dc510e90
...@@ -1020,8 +1020,8 @@ DEPENDENCIES ...@@ -1020,8 +1020,8 @@ DEPENDENCIES
google-api-client (~> 0.8.6) google-api-client (~> 0.8.6)
grape (~> 0.19.2) grape (~> 0.19.2)
grape-entity (~> 0.6.0) grape-entity (~> 0.6.0)
gssapi
grape-route-helpers (~> 2.0.0) grape-route-helpers (~> 2.0.0)
gssapi
haml_lint (~> 0.21.0) haml_lint (~> 0.21.0)
hamlit (~> 2.6.1) hamlit (~> 2.6.1)
hashie-forbidden_attributes hashie-forbidden_attributes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment