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
blue/res
green/res
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