Fork: 0
nitta-lab-2018 / Cactus
Browse code
Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java
CleanArchitecture ForEasySignUp RemakeLoginFragment bullet correct_design master test ui
commit 83520616c57ffc9322d9f1f1094b1c3d8592dbc2
2 parents d336c3b + f4dd367
a-matsumoto authored on 16 Oct 2018
Patch
Unified Split
Showing 1 changed file
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/ObjectsConnection.java 0 → 100644