Commit ac54049

Stephen Peasley <s@stephenpeasley.com>
2015-05-30 16:00:01
Merge conflict
master
1 parent 547a84e
Changed files (1)
Gemfile.lock
Gemfile.lock
@@ -333,3 +333,6 @@ DEPENDENCIES
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
+
+BUNDLED WITH
+   1.10.1