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
..
account_actions	Add moderation warnings (#9519)	6 years ago
account_moderation_notes	…
account_warnings	Add moderation warnings (#9519)	6 years ago
accounts	Improve admin UI for account view (#9643)	6 years ago
action_logs	…
change_emails	…
custom_emojis	…
dashboard	Add instance-wide setting to disable profile directory (#9497)	6 years ago
domain_blocks	…
email_domain_blocks	…
followers	Improve admin UI for account view (#9643)	6 years ago
instances	…
invites	…
relays	…
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Add admin setting to disable followers count	6 years ago
statuses	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
subscriptions	…
tags	Add profile directory (#9427)	6 years ago
warning_presets	Add moderation warnings (#9519)	6 years ago