Merge branch 'master' into keep

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into keep_button # Conflicts: # .idea/misc.xml README master
commit e5709ca7f1c82797447113d9e168647c53ceba70 2 parents 3b5ffae + 67ef922 t-tai authored on 28 Sep 2021

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/InviteActivity.java 0 → 100644

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

Show line notes below