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

Conflicts: - `README.md`: our READMEs are entirely different and upstream's has been updated. Kept our README.
2021-05-17 10:30:34 +02:00
parent 678e07c544 4c7efdba40
commit 69737b703a
50 changed files with 1824 additions and 1549 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
    end

    def flags
-      'rc2'
+      ''
    end

    def suffix