rgarcia c9e46e3d8f fixes conflicts

2015-09-14 16:46:00 +02:00

..

assets

Adds texts for welcome, changes call to action

2015-09-14 13:40:48 +02:00

controllers

fixes conflicts

2015-09-14 16:46:00 +02:00

helpers

fixing conflicts

2015-09-13 22:00:59 +02:00

mailers

adds text_with_links helper and use that in any comment.body in views, adds test to check for malicious injections in comment body

2015-09-10 18:28:10 +02:00

models

fixes conflicts

2015-09-14 16:46:00 +02:00

views

fixes conflicts

2015-09-14 16:46:00 +02:00