rgarcia 86dd709c13 fixes conflicts with master [#500]

2015-09-28 11:51:26 +02:00

..

assets

Updates admin and moderation texts

2015-09-25 09:40:51 +02:00

controllers

fixes conflicts with master [#500]

2015-09-28 11:51:26 +02:00

helpers

displays failed census calls [#500]

2015-09-24 17:21:08 +02:00

mailers

fixes i18n error

2015-09-25 13:47:42 +02:00

models

refactors pending verification step view [#500]

2015-09-24 17:21:10 +02:00

views

fixes conflicts with master [#500]

2015-09-28 11:51:26 +02:00