Juanjo Bazán af0698da35 fixes conflicts

2015-08-07 10:12:58 +02:00

..

account

Adds nickname and use_nickname to "my profile"

2015-08-06 19:19:45 +02:00

comments

fix conflict

2015-08-05 14:46:18 +02:00

debates

refactors votes view code to helper

2015-08-07 09:19:02 +02:00

devise

Merge pull request #111 from AyuntamientoMadrid/user_nickname_98

2015-08-07 09:23:44 +02:00

layouts

Adds styles for authentication pages

2015-08-06 20:53:14 +02:00

shared

Changes styles for debates index and debate show

2015-08-04 13:25:00 +02:00