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
..
androidTest/java/com/keylesspalace/tusky	Timeline paging (#2238)	2022-01-11 19:00:29 +01:00
blue	Merge remote-tracking branch 'tuskyapp/develop'	2020-04-09 00:34:31 +09:00
green	Merge remote-tracking branch 'tuskyapp/develop'	2022-04-13 00:59:06 +09:00
main	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-19 02:42:27 +09:00
test/java	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-19 02:42:27 +09:00