Konrad Pozniak 898cff1df3 Merge remote-tracking branch 'weblate/develop' into develop ... # Conflicts: # app/src/main/res/values-gd/strings.xml		2022-04-28 21:56:32 +02:00
..
androidTest/java/com/keylesspalace/tusky	Timeline paging (#2238)	2022-01-11 19:00:29 +01:00
blue/res	upgrade dependencies, fix some warnings (#1747)	2020-04-06 11:46:38 +02:00
green/res	Android 12 support, update AndroidX libraries (#2367)	2022-03-09 20:50:23 +01:00
main	Merge remote-tracking branch 'weblate/develop' into develop	2022-04-28 21:56:32 +02:00
test/java	New emoji picker (#2395)	2022-04-26 18:50:58 +02:00