luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 11:53:13 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/.github
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
..
ISSUE_TEMPLATE Correct prettier calls for YML/JSON (#21832) 2022-12-03 12:05:35 +09:00
workflows Merge branch 'main' into glitch-soc/merge-upstream 2023-07-17 19:02:23 +02:00
FUNDING.yml Remove references to discourse.joinmastodon.org (#17797) 2022-03-15 08:13:22 +01:00
renovate.json5 Try to improve Renovatebot config (#26005) 2023-07-17 09:33:22 +02:00
stale.yml
stylelint-matcher.json Set-up Problem Matchers (#18598) 2022-06-16 22:09:43 +02:00