chore(merging-upstream): bunch of conflicts to solve
This commit is contained in:
1
metadata/zh-TW/short_description.txt
Normal file
1
metadata/zh-TW/short_description.txt
Normal file
@@ -0,0 +1 @@
|
||||
Mastodon for Android,但它是粉色的並且具有更多功能
|
||||
1
metadata/zh-TW/title.txt
Normal file
1
metadata/zh-TW/title.txt
Normal file
@@ -0,0 +1 @@
|
||||
Moshidon
|
||||
Reference in New Issue
Block a user