Merge remote-tracking branch 'origin/master' into createUserViewModels2
commit d1f9e0681921cb1ead4eb2e27d4efccb824ca09f
2 parents 6f4db5c + 048e896
HataiShunsuke authored 9 hours ago
Showing 3 changed files
View
app/build.gradle.kts
View
app/src/main/java/com/example/tampopo_client/resources/FriendsResource.java
View
app/src/main/res/layout/activity_register.xml