Konrad Pozniak 8c08fbddb6 fix merge conflict		2022-12-01 19:33:20 +01:00
..
androidTest/java/com/keylesspalace/tusky	Timeline paging (#2238)	2022-01-11 19:00:29 +01:00
blue/res	new app icon (#2695)	2022-09-13 19:48:09 +02:00
green/res	new app icon (#2695)	2022-09-13 19:48:09 +02:00
main	fix merge conflict	2022-12-01 19:33:20 +01:00
test/java	Language selection fixes (#2917)	2022-11-24 15:45:19 +01:00