Go to file

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

app

Merge branch 'RecyclerView' into follow-route

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

gradle/wrapper

added all daos

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

.gitignore

Update .gitignore

2020-12-08 10:37:25 +01:00

build.gradle

[ADD] add empty project

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

gradle.properties

[ADD] add empty project

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

gradlew

[ADD] add empty project

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

gradlew.bat

[ADD] add empty project

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

README.md

Initial commit

2020-12-08 10:17:55 +01:00

settings.gradle

[ADD] add empty project

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

README.md

Next-Location

MGS Application project for quarter 2.2