24 Oct, 2014
13 commits
-
Conflicts: public/javascripts/comment_form.js
23 Oct, 2014
14 commits
-
Conflicts: public/javascripts/application.js public/stylesheets/application.css
-
Conflicts: app/helpers/layout_helper.rb public/javascripts/application.js public/stylesheets/application.css
22 Oct, 2014
9 commits
-
Conflicts: app/helpers/profile_helper.rb app/views/content_viewer/_article_toolbar.rhtml app/views/profile/_common.rhtml app/views/profile/_organization_profile.rhtml app/views/profile/_person_profile.rhtml db/schema.rb public/stylesheets/application.css
21 Oct, 2014
4 commits