Merge branch 'master' into updated-gems

Conflicts:
	Gemfile
	Gemfile.lock
This commit is contained in:
wvengen 2013-10-09 10:37:02 +02:00
commit bdce1b5872
64 changed files with 1039 additions and 472 deletions

View file

@ -0,0 +1 @@
Resque.inline = Rails.env.test?