Merge branch 'master' into 1971-show-image-thumbnails

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index cbe2c41a4e49d5094c22f579ff657e67ff4b893c..e50802ef9920585c00574691eda90b68b230df13 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -15,7 +15,7 @@ end
 gem 'pg'
 
 # Start using multi_json once we are on Rails 3.2;
-# Rails 3.1 has a dependency on multi_json < 1.3.0 but we need version 1.3.4 to 
+# Rails 3.1 has a dependency on multi_json < 1.3.0 but we need version 1.3.4 to
 # fix bug https://github.com/collectiveidea/json_spec/issues/27
 gem 'multi_json'
 gem 'oj'