Alberto Garcia Cabeza 3f53f61b1d Fixes conflicts

2015-09-03 00:12:59 +02:00

..

assets

Fixes conflicts

2015-09-03 00:12:59 +02:00

controllers

Fixes conflicts

2015-09-03 00:12:59 +02:00

helpers

includes organizations in the cache key helper

2015-09-02 12:39:31 +02:00

mailers

adds email verification

2015-08-27 23:57:04 +02:00

models

changes rules for allowing debate votes

2015-09-02 13:40:38 +02:00

views

Fixes conflicts

2015-09-03 00:12:59 +02:00