mastodon-glitch/app/javascript/styles
Claire 4ed629cd7e Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' 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
..
contrast Fix translate button position (#25807) 2023-07-08 00:12:31 +02:00
fonts Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream 2023-07-13 13:49:58 +02:00
mastodon Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 2023-09-02 14:44:47 +02:00
mastodon-light Fix light theme select option for hashtags (#26311) 2023-08-04 09:41:17 +02:00
application.scss Add support for incoming rich text (#23913) 2023-03-03 20:19:29 +01:00
contrast.scss
mailer.scss Update Stylelint (#25819) 2023-07-12 12:31:23 +02:00
mastodon-light.scss
win95.scss Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00