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 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.		1 year ago
..
core	Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream	1 year ago
flavours	[Glitch] simplify counters	1 year ago
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
hooks	[Proposal] Make able to write React in Typescript (#16210)	2 years ago
icons	png optimization(loss less) (#19630)	2 years ago
images	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	1 year ago
mastodon	Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream	1 year ago
packs	Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream	1 year ago
skins	initial translation of Glitch-specific texts into Czech (#1997)	2 years ago
styles	Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream	1 year ago
types	Remove duplicate JPG type (#25054)	2 years ago