Merge branch 'master' into fix/edit_page_no_fix
|
---|
.idea/misc.xml |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageViewModel.java |
---|
app/src/main/res/drawable/ic_baseline_add.xml 0 → 100644 |
---|
app/src/main/res/drawable/ic_baseline_horizontal_rule.xml 0 → 100644 |
---|
app/src/main/res/drawable/ic_baseline_keyboard_arrow_left.xml 0 → 100644 |
---|
app/src/main/res/drawable/ic_baseline_keyboard_arrow_right.xml 0 → 100644 |
---|
app/src/main/res/layout/activity_page.xml |
---|