Commit a995a51a6932dc2966840a84d67afecc58169bba

Authored by Victor Costa
2 parents 5db13f32 2247304b

Merge branch 'AI2915-category_color' into rails3_stable

Conflicts:
	app/helpers/application_helper.rb
Showing 0 changed files   Show diff stats