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

Conflicts:
	app/controllers/application_controller.rb

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

..

assets

Changes styles for debates index and debate show

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

controllers

Merge branch 'master' into escoger_idioma_803

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

helpers

Allow locale to be set through the front-end

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

mailers

initial commit

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

models

fixes conflicts with master [#25]

2015-08-05 13:47:23 +02:00

views

Merge branch 'master' into escoger_idioma_803

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