Merge branch 'master' into homeFragment

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into homeFragment # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java README master
commit ef2367fbd31a1a07f862c720ff13d53c7ec4ea17 2 parents efa4345 + 5d78ef5 h-fuji authored on 2 Jul 2021

Patch

Unified Split

Showing 5 changed files

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/Acanthus.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/WorkJson.java

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

Show line notes below