Skip to content
Snippets Groups Projects
Commit 063efbb7 authored by Bruno Nocera Zanette's avatar Bruno Nocera Zanette
Browse files

Merge branch 'add-resque-support' into generate-thumbnails 

Conflicts:
	Gemfile
	config/routes.rb
parents ff412d4e c13171fb
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment