Merge remote-tracking branch 'origin/master' into FriendActivity

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge remote-tracking branch 'origin/master' into FriendActivity # Conflicts: # .idea/deploymentTargetDropDown.xml FriendActivity FriendActivity_1017 changeicon filter_ic_seturl geticon icon layoutFix master
commit 6cdf6088d6dd4f4a19ed9979803fb4eb46a88906 2 parents 8414364 + 64cf871 t-nagao authored on 12 Oct 2023

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

Ignore Space Show notes View app/src/main/java/com/example/nemophila/LoginActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/PostActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/SignUpActivity.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/resources/AccountsRest.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/resources/FriendsRest.java

Ignore Space Show notes View app/src/main/java/com/example/nemophila/resources/ShopsRest.java

Show line notes below