David Yip 82b2e224a2 Merge branch 'gs-master' into prevent-local-only-federation ...

Conflicts:
	db/schema.rb

2017-12-15 12:20:56 -06:00

..

migrate

Merge branch 'gs-master' into prevent-local-only-federation

2017-12-15 12:20:56 -06:00

schema.rb

Merge branch 'gs-master' into prevent-local-only-federation

2017-12-15 12:20:56 -06:00

seeds.rb

Fix db:seed - only run some validations when the field was changed (#3592)

2017-06-08 09:22:01 -04:00