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		2019-01-02 15:36:53 +01:00
..
admin_settings.rb	…
delete_confirmation.rb	…
migration.rb	…
status_batch.rb	Remove Form::StatusBatch::ACTION_TYPE unused (#9623)	2018-12-25 18:29:51 +01:00
two_factor_confirmation.rb	…