rgarcia 0505be08e8 fixes conflicts

2016-01-25 22:24:58 +01:00

..

assets

fixes conflicts

2016-01-25 22:24:58 +01:00

controllers

fixes conflicts

2016-01-25 22:24:58 +01:00

helpers

Merge pull request #830 from AjuntamentdeBarcelona/feature_flags

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

mailers

Store locale in a user's field and switch locale on mailers

2016-01-22 18:10:28 +01:00

models

adds #enabled? to Setting

2016-01-25 14:07:07 +01:00

views

fixes conflicts

2016-01-25 22:24:58 +01:00