Merge branch 'master' into Requesting
# Conflicts:
#	.idea/deploymentTargetDropDown.xml
commit 5cc07e03580fcc96da35581bb381e5b040552d6e
2 parents 98de927 + 3aaa5c5
k-fujii authored on 11 Jul 2023
Showing 6 changed files
View
.idea/deploymentTargetDropDown.xml
View
app/src/main/java/com/example/nemophila/FriendActivity.java
View
app/src/main/java/com/example/nemophila/SignUpActivity.java
View
app/src/main/java/com/example/nemophila/entities/AccountNameJson.java
View
app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
View
app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java