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

Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
parent 7e18e95716 66019b0ec4
commit 1c448d6474
15 changed files with 67 additions and 42 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -21,7 +21,7 @@ module Mastodon
    end

    def flags
-      'rc3'
+      'rc4'
    end

    def to_a