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

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 72b763407..8c6c9767a 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      1
+      2
     end
 
     def pre