Merge branch 'bugfix/965'
# Conflicts: # mastodon/src/main/AndroidManifest.xml
This commit is contained in:
@@ -31,6 +31,7 @@
|
||||
android:name=".MastodonApp"
|
||||
android:allowBackup="true"
|
||||
android:label="@string/mo_app_name"
|
||||
android:dataExtractionRules="@xml/backup_rules"
|
||||
android:supportsRtl="true"
|
||||
android:localeConfig="@xml/locales_config"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
|
||||
Reference in New Issue
Block a user