rgarcia 66e4581a84 fixes conflicts with master

2015-08-10 16:46:27 +02:00

..

assets

Adds content on footer

2015-08-10 15:39:38 +02:00

controllers

Merge pull request #116 from AyuntamientoMadrid/admin-77

2015-08-10 16:41:47 +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

Adapts the CommentsController to the new permissions system

2015-08-10 15:40:23 +02:00

views

fixes conflicts with master

2015-08-10 16:46:27 +02:00