rgarcia a08d5bdba9 fixes conflict in merge

2017-10-07 17:00:26 +02:00

..

assets

Merge pull request #1994 from consul/feature/1985#voting_token

2017-10-07 16:54:01 +02:00

controllers

Merge pull request #1994 from consul/feature/1985#voting_token

2017-10-07 16:54:01 +02:00

helpers

Merge branch 'master' into feature/1985#voting_token

2017-10-07 10:46:13 +02:00

mailers

Fix all rubocop Metrics/LineLength issues (140+)

2017-07-10 13:22:49 +02:00

models

Fix record_voter_participation and usage on specs

2017-10-07 10:48:24 +02:00

views

fixes conflict in merge

2017-10-07 17:00:26 +02:00