Fork: 0
nitta-lab-2018 / Cactus
Browse code
Merge branch 'master' into splash
# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
CleanArchitecture ForEasySignUp RemakeLoginFragment all-layout bullet correct_design logout_player master object_move test ui
commit 75191e291c71e8be7888a4acbeee678041a20180
2 parents 1c5b508 + 4ed3a69
n-konishi authored on 24 Jul 2018
Patch
Unified Split
Showing 7 changed files
View
.idea/caches/build_file_checksums.ser
Not supported
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/Cactus.java
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
View
app/src/main/res/layout/characters_fragment.xml