Claire 4ed629cd7e Merge commit 'be991f1d18' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream added the notion of overriden settings, while we had extra code for pseudo-settings (only used to combine flavour and skin in a single select field). Ported upstream changes. - `config/i18n-tasks.yml`: Upstream added `simple_form.overridden` to `ignore_unused`, we had `simple_form.glitch_only`. Added `simple_form.glitch_only` as well.		2023-09-02 14:44:47 +02:00
..
core	Merge commit '0719216368' into glitch-soc/merge-upstream	2023-09-02 13:18:16 +02:00
flavours	[Glitch] Fix search popout including full-text search instructions when full-text search is disabled	2023-09-02 13:56:20 +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 commit '55e7c08a83' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit '6c4c72497a' into glitch-soc/merge-upstream	2023-09-02 13:50:16 +02:00
packs	Merge commit '0719216368' into glitch-soc/merge-upstream	2023-09-02 13:18:16 +02:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge commit 'be991f1d18' into glitch-soc/merge-upstream	2023-09-02 14:44:47 +02:00
types	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00