Glitch-Shrike/app/javascript/styles/mastodon
Claire dfc05ec8df Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.
2023-09-15 21:43:49 +02:00
..
_mixins.scss
about.scss
accessibility.scss
accounts.scss
admin.scss
basics.scss
boost.scss
branding.scss
components.scss Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream 2023-09-15 21:43:49 +02:00
containers.scss
dashboard.scss
emoji_picker.scss
forms.scss
lists.scss
modal.scss
polls.scss
reset.scss
rich_text.scss
rtl.scss Fix dismiss button overlapping with text in dismissable banners (#26935) 2023-09-15 19:53:28 +02:00
statuses.scss
tables.scss
variables.scss
widgets.scss