Alberto Garcia Cabeza c048f25941 Fixes conflicts

2015-08-08 13:28:29 +02:00

..

assets

Fixes conflicts

2015-08-08 13:28:29 +02:00

controllers

Fixes conflicts

2015-08-08 13:28:29 +02:00

helpers

refactors votes view code to helper

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

mailers

sends emails [#23]

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

models

sends emails [#23]

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

views

Fixes conflicts

2015-08-08 13:28:29 +02:00