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

Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
parent cb410f80a4 830c2a9ccb
commit 5085559b15
89 changed files with 482 additions and 383 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -21,7 +21,7 @@ module Mastodon
    end

    def flags
-      'rc1'
+      'rc3'
    end

    def to_a