| Merge remote-tracking branch 'origin/master' | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java | 
|---|
| 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/home/ListAnimationViewAdapter.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteConnectionModel.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/PaintConnectionModel.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModel.java 100644 → 0 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModelContainer.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java | 
|---|
| app/src/main/res/layout/activity_sign_up.xml | 
|---|
| app/src/main/res/layout/animation_home.xml 0 → 100644 | 
|---|
| app/src/main/res/layout/fragment_home.xml | 
|---|
| app/src/main/res/layout/work_list.xml 0 → 100644 | 
|---|