kikito b28f63b016 merges master and fixes conflicts

2015-08-18 09:35:13 +02:00

..

comments

Adds styles for admin

2015-08-17 21:30:22 +02:00

dashboard

Adds styles for admin

2015-08-17 21:30:22 +02:00

debates

Adds styles for admin

2015-08-17 21:30:22 +02:00

officials

adds settings area to admin

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

organizations

adds filters to admin/organizations

2015-08-17 14:25:43 +02:00

settings

adds settings area to admin

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

tags

makes labels work in admin/tags

2015-08-17 23:27:29 +02:00

_menu.html.erb

merges master and fixes conflicts

2015-08-18 09:35:13 +02:00