Fork: 0
nitta-lab-2023 / NemophilaClient
Browse code
コンフリクト解消
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
1 parent fc1f1f9 commit aab3a09aa6e18a92b0fa13f797a0663c52151a20
k-kimoto authored on 1 Jun 2023
Patch
Unified Split
Showing 2 changed files
View
app/src/main/AndroidManifest.xml
View
app/src/main/res/values/strings.xml