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

..

migrate

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

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

seeds

Removed all trailing white space

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

schema.rb

#509 Add support for a non gravatar profile image. Assumed to be the same dimensions as a gravatar pic

2015-08-25 00:32:06 +09:30

seeds.rb

Removed all trailing white space

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