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 ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		5 years ago
..
account_actions	…
account_moderation_notes	…
account_warnings	…
accounts	Add link to search for users connected from the same IP address (#12157)	5 years ago
action_logs	…
change_emails	…
custom_emojis	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
dashboard	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_allows	Fix upstream changes breaking because of glitch-soc's theming engine	5 years ago
domain_blocks	…
email_domain_blocks	…
followers	…
instances	Link to reports targetting instance in admin view (#12513)	5 years ago
invites	…
pending_accounts	…
relays	…
report_notes	…
reports	Merge branch 'master' into glitch-soc/master	5 years ago
settings	Merge branch 'master' into glitch-soc/master	5 years ago
statuses	…
tags	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
warning_presets	…