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

2022-10-28 11:36:25 +02:00
parent 371563b0e2 8dfe5179ee
commit cb19be67d1
567 changed files with 14361 additions and 20828 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -5,19 +5,19 @@ module Mastodon
    module_function

    def major
-      3
+      4
    end

    def minor
-      5
+      0
    end

    def patch
-      3
+      0
    end

    def flags
-      ''
+      'rc1'
    end

    def suffix