Claire 993d0a9950 Merge commit '1e3b19230a' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream added new validations close to lines on which glitch-soc had modified validations to handle custom limits set through environment variables. Ported upstream changes. - `config/initializers/content_security_policy.rb`: Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is completely different. Added `AZURE_ALIAS_HOST` to our version of the file.		2023-07-30 13:15:01 +02:00
..
core	Merge commit 'd27216dc46' into glitch-soc/merge-upstream	2023-05-28 15:54:31 +02:00
flavours	New Crowdin translations (#2338)	2023-07-30 13:09:02 +02:00
fonts
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 commit '55e7c08a83' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit '1e3b19230a' into glitch-soc/merge-upstream	2023-07-30 13:15:01 +02:00
packs	Merge commit 'b0780cfeed' into glitch-soc/merge-upstream	2023-06-10 15:32:29 +02:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-17 12:52:15 +02:00
types	Remove duplicate JPG type (#25054)	2023-05-22 12:46:20 +02:00