Merge branch 'master' into michishitaEdit
|
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java 100644 → 0 |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageInfoConnectionModel.java 100644 → 0 |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/Invited/InvitedConnectionModel.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/MyPageInfoConnectionModel.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java |
---|
app/src/main/res/layout/activity_paint.xml |
---|