1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-16 23:59:11 +09:00
YuruToot/app/views/admin/settings
Claire c04f2d0cf7 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
2023-07-17 19:02:23 +02:00
..
about Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
appearance Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
branding Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
content_retention Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
discovery Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
other Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00
registrations Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
shared Add back missing glitch-soc admin settings (#1919) 2022-11-12 13:24:53 +01:00