Files
danbooru/config/application.rb
r888888888 18dd5acca7 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

860 B