This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2023-01-05 14:16:25 +01:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
flavours	[Glitch] Fix unnecessary re-rendering of various components when typing in web UI (#2063)	2023-01-05 13:32:29 +01:00
fonts	…
icons	…
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
locales	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
packs	Fix “Add new domain block” button using last submitted instead of current search value (#22485)	2023-01-05 13:42:38 +01:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00