23 Jan, 2015

2 commits

21 Jan, 2015

1 commit

16 Jan, 2015

2 commits

12 Dec, 2014

1 commit

18 Nov, 2014

1 commit

17 Nov, 2014

2 commits

05 Nov, 2014

12 commits

19 Jul, 2013

1 commit

  • b05904aa   Merge branch 'master' into rails3 ... Browse File » 
    Conflicts:
	app/helpers/boxes_helper.rb
	app/models/comment.rb
	app/views/comment/_comment.rhtml
	app/views/comment/_comment_form.rhtml
	app/views/content_viewer/_comment.html.erb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/_comment_form.html.erb
	app/views/content_viewer/_comment_form.rhtml
	app/views/profile/send_mail.html.erb
	config/routes.rb
	debian/control
    Antonio Terceiro
     

25 Dec, 2012

1 commit