Merge branch 'master' into kuraoka_List作成
|
---|
.idea/misc.xml |
---|
app/src/main/java/org/ntlab/acanthus_client/Acanthus.java |
---|
app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java |
---|
app/src/main/java/org/ntlab/acanthus_client/entities/Layer.java |
---|
app/src/main/java/org/ntlab/acanthus_client/entities/Page.java |
---|
app/src/main/java/org/ntlab/acanthus_client/resources/accounts/InvitedRest.java |
---|
app/src/main/java/org/ntlab/acanthus_client/resources/accounts/WorkRest.java |
---|
app/src/main/java/org/ntlab/acanthus_client/resources/gallery/GalleryRest.java |
---|
app/src/main/java/org/ntlab/acanthus_client/resources/gallery/InvitesRest.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/EditFragment.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/paint/PaintModel.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/acanthus_client/views/sign_up/SignUpActivity.java |
---|
app/src/main/res/layout/fragment_edit.xml |
---|