Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient
Conflicts: .idea/misc.xml
Cahnge_
ErrorType
FixFriendsViewModel
FixShopViewModel
FriendActivity
FriendActivity_1017
MPA
MypageEditor_icon
NewBranch
PostAct
RequestedAc
Sample
ShopsViewModel
accountViewModel_hiroki
changeicon
deleteMethod
filter_ic_seturl
fixRequestedAct
friendVM
geticon
icon
layoutFix
logout
master
postAct_genre
set_genre
sighlogact
|
---|
.idea/deploymentTargetDropDown.xml |
---|
.idea/misc.xml |
---|
app/src/main/java/com/example/nemophila/FriendActivity.java |
---|
app/src/main/java/com/example/nemophila/LoginActivity.java |
---|
app/src/main/java/com/example/nemophila/Nemophila.java |
---|
app/src/main/java/com/example/nemophila/PostActivity.java |
---|
app/src/main/java/com/example/nemophila/ShopActivity.java |
---|
app/src/main/java/com/example/nemophila/ShopCreateActivity.java |
---|
app/src/main/java/com/example/nemophila/SignUpActivity.java |
---|
app/src/main/res/layout/activity_sign_up.xml |
---|
app/src/main/res/layout/layout_friends_activity.xml |
---|