28 Jan, 2015

1 commit

  • d9a3fdb3   Merge branch 'master' into stable ... Browse Dir » 
    Conflicts:
	app/helpers/article_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/block.rb
	app/views/content_viewer/view_page.html.erb
	db/schema.rb
	plugins/community_track/views/blocks/_track_list_more.html.erb
	plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb
	public/javascripts/article.js
	test/unit/block_test.rb
	test/unit/person_notifier_helper_test.rb
    Victor Costa
     

15 Jan, 2015

2 commits

19 May, 2014

1 commit

12 May, 2014

1 commit

17 Mar, 2014

1 commit