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

Conflicts:
	app/controllers/application_controller.rb

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

..

account

fixing conflicts [#47] [#47]

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

comments

fix conflict

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

debates

fix conflict

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

devise

Adds styles for authentication pages

2015-07-30 19:51:33 +02:00

layouts

Allow locale to be set through the front-end

2015-08-05 15:43:39 -05:00

shared

Changes styles for debates index and debate show

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