Merge branch 'ruby-2.1'

This reverts commit 616aef4394.
2014-04-25 10:55:36 -07:00
parent f0c89fea03
commit 53844af8dc
4 changed files with 8 additions and 3 deletions
--- a/3
+++ b/3
@@ -63,3 +63,6 @@ group :development do
  # gem 'sql-logging'
 end

+group :development, :test do
+  gem 'pry'
+end