Thomas 08eb5639d3 Merge branch 'develop' of https://framagit.org/tom79/nitterizeme into develop ... Conflicts: app/src/main/java/app/fedilab/nitterizeme/adapters/InstanceAdapter.java app/src/main/java/app/fedilab/nitterizeme/helpers/Utils.java		2022-07-03 09:10:23 +02:00
..
AndroidManifest.xml	Merge branch 'develop' of https://framagit.org/tom79/nitterizeme into develop	2022-07-03 09:10:23 +02:00