Bertocq 64db7e1dec Merge branch 'master' into fix/shift_date_range_expired

2017-10-16 19:43:00 +02:00

..

assets

Merge pull request #2054 from wairbut-m2c/iagirre-answer-resize-reorder

2017-10-16 10:49:35 +02:00

controllers

searches for officers assigned to a poll

2017-10-13 18:39:13 +02:00

helpers

Merge branch 'master' into fix/shift_date_range_expired

2017-10-16 19:43:00 +02:00

mailers

Fix all rubocop Metrics/LineLength issues (140+)

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

models

Add current_or_recounting_or_incoming method to Poll model

2017-10-13 16:53:03 +02:00

views

Merge branch 'master' into fix/shift_date_range_expired

2017-10-16 19:43:00 +02:00