Glitch-Shrike/app/javascript/styles/mastodon
Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
..
_mixins.scss
about.scss
accessibility.scss
accounts.scss
admin.scss
basics.scss
boost.scss
branding.scss
components.scss Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +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