rgarcia cc3f151914 fixing conflicts

2015-07-27 23:29:32 +02:00

..

assets

fixing conflicts

2015-07-27 23:29:32 +02:00

controllers

refactoring recaptcha

2015-07-27 18:48:30 +02:00

helpers

Merge branch 'master' of github.com:AyuntamientoMadrid/participacion

2015-07-27 22:32:48 +02:00

mailers

initial commit

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

models

adds editable methods to Debate

2015-07-19 14:46:21 +02:00

views

fixing conflicts

2015-07-27 23:29:32 +02:00