Merge branch 'master' into michishitaEdit
commit 691e56523b74105feb21c7a32e4caba8fd418c7a
2 parents d31ec35 + 9389d72
s-michishita authored on 20 Jul 2021
Showing 7 changed files
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java 100644 → 0
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageInfoConnectionModel.java 100644 → 0
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/Invited/InvitedConnectionModel.java 0 → 100644
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/MyPageInfoConnectionModel.java 0 → 100644
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java
View
app/src/main/res/layout/activity_paint.xml