05 Sep, 2014
3 commits
03 Sep, 2014
1 commit
02 Sep, 2014
2 commits
-
(ActionItem3191)
01 Sep, 2014
11 commits
29 Aug, 2014
23 commits
-
Conflicts: plugins/proposals_discussion/lib/proposals_discussion_plugin/discussion.rb plugins/proposals_discussion/lib/proposals_discussion_plugin/proposal.rb plugins/proposals_discussion/lib/proposals_discussion_plugin/topic.rb plugins/proposals_discussion/views/content_viewer/proposal.html.erb
-
Conflicts: app/helpers/layout_helper.rb db/schema.rb