Merge branch 'master' into PlplupLearnedBulletSeed
# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java
#	app/src/main/res/layout/ui_fragment.xml

微修正
1 parent 137ceb7 commit 17d57e3179f6bb262df3ddd71a0ea05b71ddaf6d
a-matsumoto authored on 13 Nov 2018
Showing 2 changed files
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java
View
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java