Merge branch 'FriendActivity'

Fork: 0

nitta-lab-2023 / NemophilaClient

Browse code Merge branch 'FriendActivity' # Conflicts: # .idea/deploymentTargetDropDown.xml FriendActivity_1017 changeicon filter_ic_seturl geticon icon layoutFix master
commit aad2cd9b692fa7dfe1e42fb4586ca355fce97081 2 parents 64cf871 + 8d8d4fd t-nagao authored on 12 Oct 2023

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

Ignore Space Show notes View .idea/misc.xml

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

Show line notes below