Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.		2022-10-30 18:15:28 +01:00
..
admin.js	Move flavours/glitch/utils/ready to flavours/glitch/ready	2022-10-11 11:31:11 +02:00
common.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	2020-10-21 21:28:47 +02:00
error.js	Move flavours/glitch/utils/ready to flavours/glitch/ready	2022-10-11 11:31:11 +02:00
home.js	Move more modules from flavours/glitch/utils to flavours/glitch	2022-10-11 12:25:45 +02:00
public.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 18:15:28 +01:00
settings.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 18:15:28 +01:00
share.js	Move more modules from flavours/glitch/utils to flavours/glitch	2022-10-11 12:25:45 +02:00