01 Jul, 2015
14 commits
-
Conflicts: app/controllers/my_profile/tasks_controller.rb app/views/tasks/processed.html.erb test/functional/tasks_controller_test.rb
30 Jun, 2015
12 commits
-
Conflicts: app/controllers/my_profile/tasks_controller.rb
-
Conflicts: app/controllers/my_profile/tasks_controller.rb public/stylesheets/tasks.css
-
Conflicts: app/views/tasks/processed.html.erb public/stylesheets/tasks.css
-
Conflicts: app/views/tasks/processed.html.erb public/stylesheets/tasks.css
29 Jun, 2015
14 commits
-
Conflicts: public/stylesheets/tasks.css