Merge branches 'ObjectsConnection' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp:8080/gitbucket/git/nitta-lab-2018/Cactus into ObjectsConnection

Fork: 0

nitta-lab-2018 / Cactus

Browse code Merge branches 'ObjectsConnection' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp:8080/gitbucket/git/nitta-lab-2018/Cactus into ObjectsConnection # Conflicts: # .idea/caches/build_file_checksums.ser CleanArchitecture ForEasySignUp RemakeLoginFragment bullet correct_design master test ui
commit 8382c9d2c9fc556e9f22d0c8e9e564d69e4bc493 2 parents d0e04a1 + 9c95bd6 s-bekki authored on 16 Oct 2018

Patch

Unified Split

Showing 4 changed files

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

Ignore Space Show notes View app/build.gradle

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

Ignore Space Show notes View build.gradle

Show line notes below