Alberto Garcia Cabeza c048f25941 Fixes conflicts

2015-08-08 13:28:29 +02:00

..

account

Fixes conflicts

2015-08-08 13:28:29 +02:00

comments

fix conflict

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

debates

refactors votes view code to helper

2015-08-07 09:19:02 +02:00

devise

Fixes conflicts

2015-08-08 13:28:29 +02:00

layouts

Merge pull request #119 from AyuntamientoMadrid/header

2015-08-08 01:51:59 +02:00

mailer

sends emails [#23]

2015-08-07 20:52:53 +02:00

shared

Changes styles for debates index and debate show

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