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 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		5 years ago
..
account_actions	…
account_moderation_notes	…
account_warnings	…
accounts	…
action_logs	…
announcements	…
change_emails	…
custom_emojis	…
dashboard	…
domain_allows	…
domain_blocks	…
email_domain_blocks	…
instances	…
invites	…
pending_accounts	…
relationships	…
relays	…
report_notes	…
reports	…
settings	…
statuses	…
tags	…
warning_presets	…