mastodon/app/javascript/styles/mastodon
Claire ab2f0daa10 Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-security.yml`:
  Changes were already cherry-picked and adapted in glitch-soc.
  Kept glitch-soc's version.
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
..
_mixins.scss
about.scss
accessibility.scss
accounts.scss
admin.scss
basics.scss
branding.scss
components.scss Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream 2024-02-24 14:27:43 +01: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