Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.
This commit is contained in:
Claire
2022-03-15 20:45:27 +01:00
146 changed files with 1357 additions and 820 deletions

View File

@ -9,15 +9,15 @@ module Mastodon
end
def minor
4
5
end
def patch
6
0
end
def flags
''
'rc1'
end
def suffix