Konrad Pozniak 8c08fbddb6 fix merge conflict		2022-12-01 19:33:20 +01:00
..
java/com/keylesspalace/tusky	fix merge conflict	2022-12-01 19:33:20 +01:00
res	fix merge conflict	2022-12-01 19:33:20 +01:00
AndroidManifest.xml	Add view for browsing and unfollowing followed hashtags (#2794)	2022-12-01 19:24:27 +01:00
ic_launcher-web.png	new app icon (#2695)	2022-09-13 19:48:09 +02:00