Thibaut Girka 8cb843039c Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js		2018-10-09 21:08:26 +02:00
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-09 21:08:26 +02:00
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-17 17:43:54 +02:00
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-09 21:08:26 +02:00
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	2017-06-08 09:22:01 -04:00