Alberto Garcia Cabeza ee72096890 fixes conflicts

2015-08-29 00:40:15 +02:00

..

assets

fixes conflicts

2015-08-29 00:40:15 +02:00

controllers

Merge pull request #275 from mlovic/filter-topic

2015-08-28 17:41:38 +02:00

helpers

adds translations

2015-08-28 00:03:08 +02:00

mailers

adds email verification

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

models

fixes failing specs

2015-08-28 19:19:18 +02:00

views

fixes conflicts

2015-08-29 00:40:15 +02:00