kikito e2b405083c merges master and fixes conflicts

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

..

assets

Fixes conflicts

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

controllers

merges master and fixes conflicts

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

helpers

makes spaces consistent

2015-09-03 01:29:46 +02:00

mailers

adds email verification

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

models

Merge pull request #339 from AyuntamientoMadrid/remove-tag-filter-337

2015-09-03 11:50:53 +02:00

views

Merge pull request #339 from AyuntamientoMadrid/remove-tag-filter-337

2015-09-03 11:50:53 +02:00