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		2019-12-19 13:52:54 +01:00
..
admin.js	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
common.js	…
embed.js	…
mailer.js	…
public.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
settings.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
theme.yml	Include necessary JS in auth pages	2019-06-13 22:38:22 +02:00