RemoMeijer a3d8bdfd77 Merge branch 'develop' into RecyclerView ...

# Conflicts:
#	app/src/main/java/com/a1/nextlocation/data/Location.java

2020-12-17 14:56:15 +01:00

..

src

Merge branch 'develop' into RecyclerView

2020-12-17 14:56:15 +01:00

.gitignore

[ADD] add empty project

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

build.gradle

remove room stuff

2020-12-17 10:32:28 +01:00

proguard-rules.pro

[ADD] add empty project

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