You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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`		2 years ago
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
flavours	[Glitch] Fix unnecessary re-rendering of various components when typing in web UI (#2063)	2 years ago
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
icons	png optimization(loss less) (#19630)	2 years ago
images	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
packs	Fix “Add new domain block” button using last submitted instead of current search value (#22485)	2 years ago
skins	initial translation of Glitch-specific texts into Czech (#1997)	2 years ago
styles	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago