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

Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.
2020-12-19 00:55:12 +01:00
parent 92cfcf168c c6598b17d9
commit f9d000ebae
212 changed files with 5850 additions and 1383 deletions
@@ -17,7 +17,7 @@ module Mastodon
    end

    def flags
-      'rc1'
+      'rc2'
    end

    def suffix