Merge branch 'gs-master' into prevent-local-only-federation

Conflicts: db/schema.rb
2017-12-15 12:20:56 -06:00
parent 6abb0950c6 e0a573a2ce
commit 82b2e224a2
217 changed files with 2868 additions and 1294 deletions
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
    end

    def pre
-      'rc2'
+      'rc6'
    end

    def flags