rgarcia cade157acd fixes conflicts with master

2016-01-21 17:27:02 +01:00

..

assets

fixes conflicts with master

2016-01-21 17:27:02 +01:00

controllers

fixes conflicts with master

2016-01-21 17:27:02 +01:00

helpers

Merge pull request #830 from AjuntamentdeBarcelona/feature_flags

2016-01-18 15:19:09 +01:00

mailers

fixes specs

2015-11-09 14:27:56 +01:00

models

Use model table name instead of hardcoding it

2016-01-19 12:44:15 +01:00

views

Merge pull request #843 from consul/search-dates

2016-01-20 17:01:28 +01:00