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 微修正 |
---|
|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java |
---|
app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java |
---|