You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 571d219bb9 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		6 years ago
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	8 years ago