Glitch-Shrike/app/javascript/styles/mastodon
Claire 83480df820 Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added `<s>` to the list of allowed tags, the conflict is because
  we have a different list of allowed tags.
  Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
..
_mixins.scss
about.scss
accessibility.scss
accounts.scss
admin.scss
basics.scss
branding.scss
components.scss Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream 2024-08-12 17:46:24 +02:00
containers.scss
dashboard.scss
emoji_picker.scss
forms.scss
lists.scss
modal.scss
polls.scss
reset.scss
rich_text.scss
rtl.scss
statuses.scss
tables.scss
variables.scss
widgets.scss