Juanjo Bazán 7e1cd2940d Fix conflicts

2015-08-17 21:08:15 +02:00

..

assets

Fix conflicts

2015-08-17 21:08:15 +02:00

controllers

Fix conflicts

2015-08-17 21:08:15 +02:00

helpers

Fix conflicts

2015-08-17 21:08:15 +02:00

mailers

sends emails [#23]

2015-08-07 20:52:53 +02:00

models

Fix conflicts

2015-08-17 21:08:15 +02:00

views

Fix conflicts

2015-08-17 21:08:15 +02:00