kyori19 1abe28943c Merge remote-tracking branch 'tuskyapp/develop' ... # Conflicts: # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # fastlane/metadata/android/pt-BR/changelogs/58.txt # fastlane/metadata/android/pt-BR/changelogs/61.txt # fastlane/metadata/android/pt-BR/changelogs/72.txt		2022-03-08 08:03:21 +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'	2019-12-27 14:46:18 +09:00
main	Merge remote-tracking branch 'tuskyapp/develop'	2022-03-08 08:03:21 +09:00
test/java	Merge remote-tracking branch 'tuskyapp/develop'	2022-03-04 17:51:25 +09:00