This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/layouts
Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
..
_theme.html.haml
admin.html.haml
application.html.haml
auth.html.haml
embedded.html.haml
error.html.haml
mailer.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2023-03-16 23:12:59 +01:00
mailer.text.erb
modal.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
plain_mailer.html.haml