453f082822
# Conflicts: # mastodon/src/main/res/values-pt-rBR/strings_sk.xml # metadata/ar/short_description.txt # metadata/id/changelogs/67.txt |
||
---|---|---|
.. | ||
changelogs | ||
full_description.txt | ||
short_description.txt | ||
title.txt |
453f082822
# Conflicts: # mastodon/src/main/res/values-pt-rBR/strings_sk.xml # metadata/ar/short_description.txt # metadata/id/changelogs/67.txt |
||
---|---|---|
.. | ||
changelogs | ||
full_description.txt | ||
short_description.txt | ||
title.txt |