Thibaut Girka 44f2224606 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		2019-01-02 15:36:53 +01:00
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +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	2019-01-02 15:36:53 +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