GitBucket
|
Merge branch 'master' into ShopActivity
# Conflicts: # .idea/deploymentTargetDropDown.xml
Cahnge_
ErrorType
FixFriendsViewModel
FixShopViewModel
FriendActivity
FriendActivity_1017
FriendViewModel
LogSignACT
MPA
MyPage
MypageEditor_icon
NewBranch
PostAct
Postact
RequestedAc
Sample
ShopsViewModel
SignAct
accountViewModel_hiroki
changeicon
deleteMethod
filter_ic_seturl
fixRequestedAct
friendVM
friendviewm
geticon
icon
layoutFix
logout
master
postAct_genre
set_genre
sighlogact
testFrendsViewModel
|
|---|
|
|
| .idea/misc.xml |
|---|
| app/src/main/java/com/example/nemophila/MyPageActivity.java |
|---|
| app/src/main/java/com/example/nemophila/MyPageActivityAdapter.java |
|---|
| app/src/main/java/com/example/nemophila/PostActivity.java |
|---|
| app/src/main/res/drawable/circle_button.xml 0 → 100644 |
|---|
| app/src/main/res/drawable/ic_current_location.xml |
|---|
| app/src/main/res/drawable/ic_mypage.xml 0 → 100644 |
|---|
| app/src/main/res/layout/activity_main.xml |
|---|
| app/src/main/res/layout/activity_mypage.xml |
|---|
| app/src/main/res/layout/activity_post.xml |
|---|