Merge remote-tracking branch 'origin/master'

Fork: 0

nitta-lab-2018 / Cactus

Browse code Merge remote-tracking branch 'origin/master' # Conflicts: # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java CleanArchitecture ForEasySignUp PlayerFragment RemakeLoginFragment all-layout bullet correct_design logout_player master object_move test ui
commit ae3b3b37e8df85d8e1ccbb48d3e80c8252b1a2e2 2 parents e84ee9c + 41996e9 a-matsumoto authored on 14 Jun 2018

Patch

Unified Split

Showing 3 changed files

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

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

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

Show line notes below