| Merge branch 'master' into homeFragment | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/entities/Pen.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditViewModel.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/WorkListViewAdapter.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteConnectionModel.java 100644 → 0 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/InvitesConnectionModel.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintConnectionModel.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModelContainer.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java | 
|---|
| app/src/main/res/layout/activity_paint.xml | 
|---|
| app/src/main/res/layout/fragment_edit.xml | 
|---|
| app/src/main/res/layout/fragment_home.xml | 
|---|
| app/src/main/res/layout/work_list.xml 0 → 100644 | 
|---|