Juanjo Bazán af0698da35 fixes conflicts

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

..

concerns

initial commit

2015-07-15 13:32:13 +02:00

account_controller.rb

Adds nickname and use_nickname to "my profile"

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

application_controller.rb

use custom layout for devise controllers

2015-08-06 16:01:01 +02:00

comments_controller.rb

refactors voting implementation [#25]

2015-08-05 12:24:22 +02:00

debates_controller.rb

adds css classes to voted options in debates

2015-08-06 18:53:05 +02:00

registrations_controller.rb

Adds nickname support in the registration form

2015-08-06 18:54:03 +02:00