Merge branch 'master' into obj_movetest
# Conflicts:
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instance.java
commit 4f6134f2694df81e6a453caa4dfadac89742734c
2 parents fccd921 + aff663c
n-konishi authored on 1 Nov 2018
Showing 2 changed files
View
.idea/caches/build_file_checksums.ser
Not supported
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Instance.java