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
..
account	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:50:36 +09:00
announcements	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
compose	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:50:36 +09:00
conversation	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
drafts	don't show sending failed dialog when sending was cancelled (#3226)	2023-01-28 12:40:36 +01:00
followedtags	Add view for browsing and unfollowing followed hashtags (#2794)	2022-12-01 19:24:27 +01:00
instanceinfo	Merge remote-tracking branch 'tuskyapp/develop'	2022-11-12 04:35:49 +09:00
instancemute	Fix toolbar for instance list activity. (#2248)	2021-09-28 19:55:30 +02:00
login	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:50:36 +09:00
notifications	Fix crash when failing to unsubscribe push notifications (#3234)	2023-01-28 12:40:58 +01:00
preference	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
report	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
scheduled	Fix saving changes to statuses when editing (#3103)	2022-12-31 13:04:49 +01:00
search	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
timeline	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
viewthread	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00