luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 04:13:01 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/.github
History
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
ISSUE_TEMPLATE Remove broken link references to bug bounty program (#19779) 2022-11-05 17:27:44 +01:00
workflows Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
FUNDING.yml Remove references to discourse.joinmastodon.org (#17797) 2022-03-15 08:13:22 +01:00
stale.yml
stylelint-matcher.json Set-up Problem Matchers (#18598) 2022-06-16 22:09:43 +02:00