Claire 5c4a012ac5 Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' 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
..
admin.js	…
auth.js	…
common.js	…
embed.js	…
mailer.js	Merge commit '85b3823e6638719511f705ecdd7e5ba09248cf2f' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
public.js	Fix some more Javascript linting issues and discrepancies with upstream (#2209)	2023-05-07 21:43:25 +02:00
settings.js	…
theme.yml	…
two_factor_authentication.js	…