rgarcia 6641c380bc fixing conflicts

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

..

assets

fixing conflicts

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

controllers

fixing conflicts

2015-09-13 22:00:59 +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

fixing conflicts

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

views

fixing conflicts

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