Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.
2018-06-07 05:13:49 -05:00
parent f8d50a4070 2304d52599
commit 8142bd2553
75 changed files with 436 additions and 208 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