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 63969b15b3 Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' 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.		1 year ago
..
index.js	Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' into glitch-soc/merge-upstream	1 year ago