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

No conflicts.
2019-01-19 18:28:37 +01:00
parent 530d29148c 7c3fddeab4
commit 5e0cf92fd1
57 changed files with 1103 additions and 444 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