Merge branch 'master' into obj

Fork: 0

nitta-lab-2018 / Cactus

Browse code Merge branch 'master' into obj_movetest # Conflicts: # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instance.java CleanArchitecture ForEasySignUp RemakeLoginFragment bullet correct_design master
commit 4f6134f2694df81e6a453caa4dfadac89742734c 2 parents fccd921 + aff663c n-konishi authored on 1 Nov 2018

Patch

Unified Split

Showing 2 changed files

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

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

Show line notes below