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 fa4a92e340 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
..
_action_log.html.haml	Improve report layout (#7188)	7 years ago
_status.html.haml	Add noopener and/or noreferrer (#12202)	5 years ago
index.html.haml	Avoid using pluralize on moderation pages (#12589)	5 years ago
show.html.haml	Merge branch 'master' into glitch-soc/master	5 years ago