RemoMeijer 391792a5e2 Merge branch 'RecyclerView' into follow-route ...

# Conflicts:
#	app/src/main/assets/locations.json
#	app/src/main/assets/routes.json
#	app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
#	app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
#	app/src/main/res/values/strings.xml

2021-01-06 13:20:52 +01:00

..

src

Merge branch 'RecyclerView' into follow-route

2021-01-06 13:20:52 +01:00

.gitignore

[ADD] add empty project

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

build.gradle

Merge branch 'directions-api' into develop

2021-01-04 15:47:31 +01:00

proguard-rules.pro

[ADD] add empty project

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