forked from jacknudt/trustieforge
Conflicts: app/controllers/application_controller.rb app/views/attachments/upload.js.erb app/views/courses/_homework_form.html.erb app/views/layouts/base_courses.html.erb app/views/users/_my_joinedcourse.html.erb db/schema.rb lib/redmine.rb lib/redmine/access_control.rb |
||
---|---|---|
.. | ||
acts-as-taggable-on | ||
acts_as_activity_provider | ||
acts_as_attachable | ||
acts_as_customizable | ||
acts_as_event | ||
acts_as_list | ||
acts_as_searchable | ||
acts_as_tree | ||
acts_as_versioned | ||
acts_as_watchable | ||
awesome_nested_set | ||
gravatar | ||
open_id_authentication | ||
rfpdf |