Merge branch 'master' into implement-activity-viewmodel
commit 180e09ed7bc020c2fa208a1b94b8f82d6fce028b
2 parents d95fd95 + e1b64a6
Shohei Yamagiwa authored 4 days ago
Showing 3 changed files
View
app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
View
app/src/main/res/layout/activity_launch.xml
View
app/src/main/res/layout/activity_register.xml