Claire c81d1b0d38 Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did. - `app/javascript/packs/public.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did.		2023-05-09 22:12:05 +02:00
..
rules	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-03 17:40:59 +02:00
configuration.js
development.js
generateLocalePacks.js	Move locale-data back to app/javascript/mastodon/locales/locale-data (#2169)	2023-04-08 14:11:40 +02:00
production.js
shared.js	Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
tests.js
translationRunner.js	Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream (#2208)	2023-05-07 18:22:25 +02:00