Merge branch 'master' into net

Fork: 0

nitta-lab-2018 / Cactus

Browse code Merge branch 'master' into net # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/AndroidManifest.xml CleanArchitecture ForEasySignUp PlayerFragment RemakeLoginFragment all-layout bullet correct_design logout_player master object_move test ui
commit 5ecc47e9bbc16a91fd76cc091833b44c2ef0509d 2 parents f534634 + 39a2e78 n-konishi authored on 5 Jun 2018

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View .idea/caches/build_file_checksums.ser
Not supported

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/LoginFragment.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/SignUpFragment.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/viewModels/test

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

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

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

Ignore Space Show notes View build.gradle

Show line notes below