David Yip ed490b781f Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	Gemfile.lock
 	config/application.rb

2018-04-13 16:36:46 -05:00

..

migrate

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-04-03 19:17:20 +00:00

schema.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-13 16:36:46 -05:00

seeds.rb

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

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