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 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.		6 years ago
..
account_actions	…
account_moderation_notes	…
account_warnings	…
accounts	…
action_logs	…
change_emails	…
custom_emojis	…
dashboard	…
domain_blocks	…
email_domain_blocks	…
instances	…
invites	…
relays	…
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	…
statuses	…
subscriptions	…
tags	…
warning_presets	…