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

# Conflicts: resolved
#	app/src/main/res/layout/fragment_location.xml
#	app/src/main/res/layout/fragment_location_detail.xml

2020-12-16 10:43:46 +01:00

..

src

Merge branch 'develop' into RecyclerView

2020-12-16 10:43:46 +01:00

.gitignore

[ADD] add empty project

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

build.gradle

added all daos

2020-12-14 15:07:53 +01:00

proguard-rules.pro

[ADD] add empty project

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