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

Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
parent 2a4ce7458a 7d5e2dda78
commit f513317ba2
64 changed files with 1251 additions and 33 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      3
+      4
    end

    def pre