Juanjo Bazán ae8068f5fd fix conflict

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

..

assets

Changes styles for debates index and debate show

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

controllers

vote action not allowed for unauthenticated users

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

helpers

adds i18n to comments_helper

2015-07-31 15:13:00 +02: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

fix conflict

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