chore(merging-upstream): bunch of conflicts to solve
This commit is contained in:
4
mastodon/src/main/res/values-kab/strings_mo.xml
Normal file
4
mastodon/src/main/res/values-kab/strings_mo.xml
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
</resources>
|
||||
4
mastodon/src/main/res/values-kab/strings_sk.xml
Normal file
4
mastodon/src/main/res/values-kab/strings_sk.xml
Normal file
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="sk_app_name">Megalodon</string>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user