Merge branch 'master' into implement-activity-viewmodel
|
---|
app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java |
---|
app/src/main/res/layout/activity_launch.xml |
---|
app/src/main/res/layout/activity_register.xml |
---|