Merge branch 'master' into feature/create_sign_up

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into feature/create_sign_up # Conflicts: # app/src/main/AndroidManifest.xml README master
commit 4f66078c95f0e9b8f5701109d1e673dae26ce636 2 parents f36d20f + 1cde9b7 k-fujii authored on 4 Jun 2021

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java

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

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

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

Ignore Space Show notes View app/src/main/res/layout/activity_paint.xml 0 → 100644

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

Show notes View app/src/main/res/layout/fragment_make.xml 100644 → 0

Ignore Space Show notes View app/src/main/res/navigation/mobile_navigation.xml

Show line notes below