Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		2018-11-27 13:23:02 +01:00
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	2017-06-08 09:22:01 -04:00