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

Fix order in Gemfile.lock See merge request !2969

Merge branch 'fix-gemfile-lock' into 'master'
Fix order in Gemfile.lock See merge request !2969
8d3e5cf0 · Robert Speicher · 3973ce0f · 77603c3e · 8d3e5cf0
Commit 8d3e5cf0 authored Feb 25, 2016 by Robert Speicher
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
@@ -960,8 +960,8 @@ DEPENDENCIES
  mysql2 (~> 0.3.16)
  nested_form (~> 0.3.2)
  net-ssh (~> 3.0.1)
-  nokogiri (~> 1.6.7, >= 1.6.7.2)
  newrelic_rpm (~> 3.14)
+  nokogiri (~> 1.6.7, >= 1.6.7.2)
  nprogress-rails (~> 0.1.6.7)
  oauth2 (~> 1.0.0)
  octokit (~> 3.8.0)