sebas f0f87af42b Merge branch 'follow-route' into RecyclerView ...

# Conflicts:
#	app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java

2021-01-06 13:23:58 +01:00

..

androidTest/java/com/a1/nextlocation

[ADD] add empty project

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

main

Merge branch 'follow-route' into RecyclerView

2021-01-06 13:23:58 +01:00

test/java/com/a1/nextlocation

Merge remote-tracking branch 'origin/Tests' into Tests

2021-01-04 15:27:58 +01:00