Merge branch 'master' into Follows&FollowersEdit

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into Follows&FollowersEdit # Conflicts: # .idea/misc.xml README master
commit e1971a4ba472823f63aab4c2624ff12d091f0b18 2 parents 25c4322 + 4be739d s-michishita authored on 30 Jul 2021

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View .idea/gradle.xml

Show notes View .idea/runConfigurations.xml 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/gallery/LayersRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java

Ignore Space Show notes View app/src/main/res/layout/fragment_edit.xml

Show line notes below