chore(merging-upstream): bunch of conflicts to solve

This commit is contained in:
LucasGGamerM
2024-02-14 20:50:54 -03:00
parent 8dffbff97c
commit 0af8dbf09b
2000 changed files with 52238 additions and 10716 deletions

View File

@@ -0,0 +1 @@
Mastodon for Android但它是粉色的並且具有更多功能

1
metadata/zh-TW/title.txt Normal file
View File

@@ -0,0 +1 @@
Moshidon