Jeremy Kescher 9fe04326ea Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # config/routes.rb # db/schema.rb # lib/mastodon/version.rb		2023-05-09 23:26:00 +02:00
..
core	Fix some more Javascript linting issues and discrepancies with upstream (#2209)	2023-05-07 21:43:25 +02:00
flavours	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
hooks	[Proposal] Make able to write React in Typescript (#16210)	2023-04-03 03:31:39 +02:00
icons	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
locales	Move locale-data back to app/javascript/mastodon/locales/locale-data (#2169)	2023-04-08 14:11:40 +02:00
mastodon	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-22 10:06:11 +02:00
skins	Merge remote-tracking branch 'upstream/main' into develop	2022-12-09 14:47:08 +01:00
styles	Merge remote-tracking branch 'upstream/main' into develop	2023-05-09 23:26:00 +02:00
types	Remove MastodonMap TS type (#24807)	2023-05-03 13:32:11 +02:00