kyori19
|
25bee533f1
|
Merge remote-tracking branch 'tuskyapp/develop'
# 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
|
2022-05-19 02:42:27 +09:00 |