Juanjo Bazán 7e1cd2940d Fix conflicts

2015-08-17 21:08:15 +02:00

..

account

improves consistency of error messages [#110]

2015-08-16 15:57:09 +02:00

admin

adds settings area to admin

2015-08-17 18:38:57 +02:00

comments

adds i18n to deleted comments

2015-08-17 14:08:59 +02:00

debates

Adds filters for topics

2015-08-17 15:00:59 +02:00

devise

improves consistency of error messages [#110]

2015-08-16 15:57:09 +02:00

layouts

Fix conflicts

2015-08-17 21:08:15 +02:00

mailer

sends emails [#23]

2015-08-07 20:52:53 +02:00

moderation

adds moderation to comments and debates [#136]

2015-08-17 13:39:31 +02:00

shared

improves consistency of error messages [#110]

2015-08-16 15:57:09 +02:00

simple_captcha

Improves styles for simple captcha

2015-08-15 01:05:00 +02:00

stats

Show charts using c3.js

2015-08-17 19:15:17 +02:00

welcome

Adds styles for titles and filters

2015-08-17 14:53:00 +02:00