Alberto Garcia Cabeza 9f8229465c fixes conflicts

2015-08-17 21:36:06 +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

settings

adds settings area to admin

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

tags

Adds styles for admin

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

_menu.html.erb

Adds styles for admin

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