| Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2021/org.ntlab.acanthus_client | 
|---|
| .idea/gradle.xml | 
|---|
| .idea/misc.xml | 
|---|
| .idea/runConfigurations.xml 100644 → 0 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/resources/gallery/LayersRest.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java | 
|---|
| app/src/main/res/layout/fragment_edit.xml | 
|---|