Fork: 0
nitta-lab-2023 / NemophilaClient
Browse code
Merge branch 'master' into MyPage
# Conflicts:
#	app/src/main/res/values/strings.xml
Cahnge_ ErrorType FixFriendsViewModel FixShopViewModel FriendActivity FriendActivity_1017 FriendViewModel LogSignACT MPA MyPage MypageEditor_icon NewBranch PostAct Postact RequestedAc Sample ShopToMarker ShopsViewModel SignAct Test TimerViewModel accountViewModel_hiroki changeicon deleteMethod ent_Account filter_ic_seturl fixRequestedAct friendVM friendviewm geticon icon layoutFix logout master postAct_genre set_genre shop sighlogact testFrendsViewModel
commit 172c2cdafb449abc595f47aa1a75cbacb54452d0
2 parents fcad29a + db70c0a
k-suzuki authored on 30 May 2023
Patch
Unified Split
Showing 9 changed files
View
.gitignore
View
.idea/misc.xml
View
app/src/main/AndroidManifest.xml
View
app/src/main/java/com/example/nemophila/PostActivity.java 0 → 100644
View
app/src/main/java/com/example/nemophila/resources/AccountsRest.java 0 → 100644
View
app/src/main/java/com/example/nemophila/resources/PostsRest.java 0 → 100644
View
app/src/main/java/com/example/nemophila/resources/ShopsRest.java 0 → 100644
View
app/src/main/res/layout/activity_post.xml 0 → 100644
View
app/src/main/res/values/strings.xml