Conflicts: app/views/layouts/base_courses.html.erb app/views/layouts/base_homework.html.erb app/views/projects/_course.html.erb db/schema.rb lib/redmine/activity/fetcher.rb