Juanjo Bazán af0698da35 fixes conflicts

2015-08-07 10:12:58 +02:00

..

assets

Fixes conflicts

2015-08-06 20:58:54 +02:00

controllers

fixes conflicts

2015-08-07 10:12:58 +02:00

helpers

refactors votes view code to helper

2015-08-07 09:19:02 +02:00

mailers

initial commit

2015-07-15 13:32:13 +02:00

models

fixes conflicts

2015-08-07 10:12:58 +02:00

views

fixes conflicts

2015-08-07 10:12:58 +02:00