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

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

app/serializers/rest/account_serializer.rb

@@ -25,7 +25,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
   end
 
   def note
-    Formatter.instance.simplified_format(object, custom_emojify: true)
+    Formatter.instance.simplified_format(object)
   end
 
   def url

app/serializers/rest/credential_account_serializer.rb

@@ -9,6 +9,7 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
     {
       privacy: user.setting_default_privacy,
       sensitive: user.setting_default_sensitive,
+      language: user.setting_default_language,
       note: object.note,
       fields: object.fields.map(&:to_h),
     }