Brenda Wallace 629352ef4f Merge remote-tracking branch 'upstream/dev' into mailbox ...

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/application.scss
	db/schema.rb

2019-07-20 13:20:10 +12:00

..

migrate

Merge remote-tracking branch 'upstream/dev' into mailbox

2019-07-20 13:20:10 +12:00

seeds

Removed all trailing white space

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

schema.rb

Merge remote-tracking branch 'upstream/dev' into mailbox

2019-07-20 13:20:10 +12:00

seeds.rb

Align all the hashes

2018-12-30 15:22:29 +13:00