kyori19 52a757e572 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/components/account/AccountActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt # app/src/main/res/values-cy/strings.xml # app/src/main/res/values-eu/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-oc/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values-zh-rSG/strings.xml # app/src/test/java/com/keylesspalace/tusky/MainActivityTest.kt # fastlane/metadata/android/en-US/images/phoneScreenshots/00_login.png		2023-01-29 04:50:36 +09:00
..
android	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:50:36 +09:00