06 Mar, 2014

1 commit


27 Feb, 2014

1 commit


26 Feb, 2014

6 commits


25 Feb, 2014

12 commits


24 Feb, 2014

3 commits


21 Feb, 2014

4 commits


20 Feb, 2014

2 commits


19 Feb, 2014

1 commit


18 Feb, 2014

3 commits


14 Feb, 2014

1 commit


13 Feb, 2014

5 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