Merge remote-tracking branch 'origin/master' into LoginActivity3
commit b8755b21edd1fecf4cab9bde3a94cf055a0050ae
2 parents c0f8ac8 + 95276d4
amika11071107 authored 1 day ago
Showing 3 changed files
View
app/src/main/java/com/example/tampopo_client/models/Activity.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/resources/ActivitiesResource.java 0 → 100644
View
app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java 0 → 100644