Merge remote-tracking branch 'origin/master' into EditorFragment
|
---|
.idea/misc.xml |
---|
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/gallery/StrokesRest.java |
---|
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 |
---|