chore(merging-upstream): bunch of conflicts to solve
This commit is contained in:
1
metadata/hr/short_description.txt
Normal file
1
metadata/hr/short_description.txt
Normal file
@@ -0,0 +1 @@
|
||||
Mastodon za Android, ali je ružičaste boje i ima više mogućnosti
|
||||
1
metadata/hr/title.txt
Normal file
1
metadata/hr/title.txt
Normal file
@@ -0,0 +1 @@
|
||||
Moshidon
|
||||
Reference in New Issue
Block a user