16 May, 2016

1 commit


22 Feb, 2015

2 commits


11 Feb, 2014

1 commit

  • Conflicts:
    	app/views/profile_themes/add_css.rhtml
    	app/views/profile_themes/add_image.rhtml
    	app/views/profile_themes/css_editor.rhtml
    	app/views/profile_themes/edit.rhtml
    	app/views/profile_themes/new.rhtml
    	app/views/themes/add_css.html.erb
    	app/views/themes/add_css.rhtml
    	app/views/themes/add_image.html.erb
    	app/views/themes/add_image.rhtml
    	app/views/themes/css_editor.html.erb
    	app/views/themes/css_editor.rhtml
    	app/views/themes/edit.html.erb
    	app/views/themes/edit.rhtml
    	app/views/themes/index.html.erb
    	app/views/themes/new.html.erb
    	app/views/themes/new.rhtml
    	test/factories.rb
    	test/functional/profile_themes_controller_test.rb
    Rodrigo Souto