rgarcia ea701e9963 fixes conflicts with polls

2017-01-29 00:44:56 +01:00

..

controllers

Fixes issue in has_orders concern

2016-12-25 22:58:21 +01:00

features

fixes conflicts with polls

2017-01-29 00:44:56 +01:00

helpers

Merge branch 'master' into polls

2017-01-19 16:51:19 +01:00

lib

Merge branch 'master' into budget

2016-11-28 11:41:49 +01:00

mailers

…

models

adds officer residence check and user voting

2017-01-29 00:36:20 +01:00

support

adds officer residence check and user voting

2017-01-29 00:36:20 +01:00

customization_engine_spec.rb

tries to fix flacky spec 'change my credentials'

2016-11-15 11:24:59 +01:00

factories.rb

adds officer residence check and user voting

2017-01-29 00:36:20 +01:00

i18n_spec.rb

…

rails_helper.rb

Increase Poltergeist timeout in specs

2017-01-19 13:38:06 +01:00

spec_helper.rb

adds officer residence check and user voting

2017-01-29 00:36:20 +01:00