Luke "Jared" Bennett 3eb8569778 Correct merge conflicts ... Fixed eslint failures		2017-01-10 12:30:39 -06:00
..
assets	Correct merge conflicts	2017-01-10 12:30:39 -06:00
controllers	…
finders	…
helpers	fix rubocop complaint about ambiguous splat operator	2017-01-10 12:30:39 -06:00
mailers	…
models	…
policies	…
serializers	…
services	…
uploaders	…
validators	…
views	fix rubocop complaint about ambiguous splat operator	2017-01-10 12:30:39 -06:00
workers	…