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:
@ -9,15 +9,15 @@ module Mastodon
|
||||
end
|
||||
|
||||
def minor
|
||||
4
|
||||
5
|
||||
end
|
||||
|
||||
def patch
|
||||
6
|
||||
0
|
||||
end
|
||||
|
||||
def flags
|
||||
''
|
||||
'rc1'
|
||||
end
|
||||
|
||||
def suffix
|
||||
|
Reference in New Issue
Block a user