Merge branch 'ruby-2.1'

Conflicts: app/assets/javascripts/comments.js app/helpers/delayed_jobs_helper.rb
2014-04-23 18:05:31 -07:00
parent 55fef2f7c6 20b595d9f3
commit 18dd5acca7
4 changed files with 8 additions and 3 deletions
--- a/3
+++ b/3
@@ -53,3 +53,6 @@ group :development do
  gem 'ruby-prof'
 end

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