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
..
admin.js	Merge branch 'master' into glitch-soc/master	5 years ago
common.js	…
embed.js	…
mailer.js	…
public.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings.js	…
theme.yml	…