Nut.andor 94843d2e9e Merge branch 'master' into v0.8.9 ...

# Conflicts:
#	AndorsTrail/app/src/main/AndroidManifest.xml
#	AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java

2023-12-31 21:19:06 +01:00

..

src/main

Merge branch 'master' into v0.8.9

2023-12-31 21:19:06 +01:00

build.gradle

debug certificate for easier debugging

2023-10-21 19:06:55 +02:00

lint.xml

Revert accidental wrong branch stuff

2022-10-11 18:31:01 +02:00