Conny Duck fcd997f36c Merge remote-tracking branch 'weblate/develop' into develop ... # Conflicts: # app/src/main/res/values-es/strings.xml # app/src/main/res/values-gl/strings.xml		2023-03-30 19:00:34 +02: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	Enforce lint cleanliness when building (#3363)	2023-03-13 10:23:42 +01:00
main	Merge remote-tracking branch 'weblate/develop' into develop	2023-03-30 19:00:34 +02:00
test/java	Show better errors when loading notifications fails (#3448)	2023-03-18 10:25:41 +01:00