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 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.		2 years ago
..
core	[Glitch] Run eslint --fix	2 years ago
flavours	[Glitch] Fix focus point of already-attached media not saving after edit	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	Merge branch 'main' into glitch-soc/merge-upstream	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