25bee533f1
# Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/MainActivity.kt # app/src/main/java/com/keylesspalace/tusky/entity/Account.kt # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
de/changelogs | ||
en-US/changelogs | ||
is/changelogs | ||
pl/changelogs | ||
pt-PT | ||
uk/changelogs | ||
vi/changelogs | ||
zh-Hans/changelogs |