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 45709d6987 Merge branch 'master' into glitch-soc/master ... Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.		5 years ago
..
account_actions	…
account_moderation_notes	…
account_warnings	…
accounts	…
action_logs	…
change_emails	…
custom_emojis	…
dashboard	…
domain_allows	…
domain_blocks	…
email_domain_blocks	…
followers	…
instances	…
invites	…
pending_accounts	…
relays	…
report_notes	…
reports	…
settings	…
statuses	…
tags	…
warning_presets	…