33b62cf9aa
# Conflicts: # mastodon/build.gradle # mastodon/src/main/res/values-ca-rES/strings_sk.xml # mastodon/src/main/res/values-de-rDE/strings.xml # mastodon/src/main/res/values-es-rES/strings_sk.xml # mastodon/src/main/res/values-fr-rFR/strings_sk.xml # mastodon/src/main/res/values-gl-rES/strings_sk.xml # mastodon/src/main/res/values-ko-rKR/strings_sk.xml # mastodon/src/main/res/values-pt-rBR/strings_sk.xml # mastodon/src/main/res/values-sl-rSI/strings_sk.xml # mastodon/src/main/res/values-uk-rUA/strings_sk.xml # mastodon/src/main/res/values-zh-rCN/strings_sk.xml # metadata/ca/full_description.txt # metadata/cy/full_description.txt # metadata/es/changelogs/65.txt # metadata/es/changelogs/67.txt # metadata/es/full_description.txt # metadata/id/full_description.txt # metadata/ko/full_description.txt # metadata/pl/full_description.txt # metadata/sl/changelogs/65.txt # metadata/sl/changelogs/67.txt # metadata/sv/full_description.txt # metadata/uk/full_description.txt # metadata/zh-Hans/full_description.txt |
||
---|---|---|
.. | ||
74.txt |