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 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.		2 years ago
..
core	[Glitch] Run eslint --fix	2 years ago
flavours	Add getting-started-misc to route (#2141)	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