sebas 12a4737567 Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop ...

# Conflicts:
#	app/src/main/assets/routes.json

2021-01-06 20:43:34 +01:00

..

src

Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop

2021-01-06 20:43:34 +01:00

.gitignore

[ADD] add empty project

2020-12-08 10:33:41 +01:00

build.gradle

[CHANGED] String values

2021-01-06 12:08:25 +01:00

proguard-rules.pro

[ADD] add empty project

2020-12-08 10:33:41 +01:00