Merge branch 'master' into ShopActivity
|
---|
.idea/misc.xml |
---|
app/src/main/java/com/example/nemophila/FriendActivity.java |
---|
app/src/main/java/com/example/nemophila/RequestingActivity.java |
---|
app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java |
---|
app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java |
---|
app/src/main/res/layout/activity_friend.xml |
---|
app/src/main/res/layout/layout_friend.xml 0 → 100644 |
---|
app/src/main/res/layout/layout_friend_dialog.xml 0 → 100644 |
---|