Merge remote-tracking branch 'origin/master' into html-pipeline

* origin/master: Need dev dependencies on travis
Lucasmartinspg · Dec 22, 2014 · 3b2e465 · 3b2e465
2 parents 80ffb79 + f55bc7d
commit 3b2e465
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -6,4 +6,3 @@ rvm:
   - 2.1.1
 notifications:
   email: false
-bundler_args: --without development