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
..
java/com/keylesspalace/tusky	distinguish between different error types in ScheduledStatusActivity (#3487)	2023-03-30 18:52:24 +02:00
res	Merge remote-tracking branch 'weblate/develop' into develop	2023-03-30 19:00:34 +02:00
AndroidManifest.xml	Support the mastodon 4 filter api (#3188)	2023-03-11 13:12:50 +01:00
ic_launcher-web.png	new app icon (#2695)	2022-09-13 19:48:09 +02:00