Fernando Seror c4eb29f99d Merge branch 'master' into escoger_idioma_803 ...

Conflicts:
	app/controllers/application_controller.rb

2015-08-05 15:47:52 -05:00

..

concerns

initial commit

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

account_controller.rb

fixing conflicts [#47] [#47]

2015-07-30 18:19:38 +02:00

application_controller.rb

Merge branch 'master' into escoger_idioma_803

2015-08-05 15:47:52 -05:00

comments_controller.rb

refactors voting implementation [#25]

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

debates_controller.rb

vote action not allowed for unauthenticated users

2015-08-05 14:34:55 +02:00

registrations_controller.rb

verify captcha only when captcha keys present

2015-08-04 12:54:24 +02:00