luna
/
mastodon
mirror of https://github.com/lunaisnotaboy/mastodon.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/domain_blocks
History
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
..
confirm_suspension.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2023-06-27 13:15:41 +02:00
edit.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
new.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00