Merge branch 'master' into PlplupLearnedBulletSeed #55

Merged n-konishi merged 1 commit into nitta-lab-2018:master from nitta-lab-2018:not8080 on 13 Nov 2018

2018-11-13	3a4647a Browse files » 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 8080はだめです。っていう変更 a-matsumoto committed on 13 Nov 2018

2018-11-13

3a4647a
Browse files »

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

8080はだめです。っていう変更

a-matsumoto committed on 13 Nov 2018