Brenda Wallace 5e0cff5b8e Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces ...

Conflicts:
	app/helpers/seeds_helper.rb
	spec/support/controller_macros.rb

2016-11-17 19:04:44 +13:00

..

assets

Removed all trailing white space

2016-11-14 15:05:32 +13:00

controllers

Removed extra blank lines, & added a end of file

2016-11-16 12:52:48 +13:00

helpers

Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces

2016-11-17 19:04:44 +13:00

mailers

Removed all trailing white space

2016-11-14 15:05:32 +13:00

models

Removed all trailing white space

2016-11-14 15:05:32 +13:00

validators

tests back to green

2015-02-09 22:41:35 +11:00

views

Removed all trailing white space

2016-11-14 15:05:32 +13:00