Merge branch 'master' into PlplupLearnedBulletSeed

Fork: 0

nitta-lab-2018 / Cactus

Browse code 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 微修正 CleanArchitecture ForEasySignUp RemakeLoginFragment correct_design master
1 parent 4aeaa7d commit c3c1e1e2569cc8f607000d501fb8101f846d6e22 a-matsumoto authored on 8 Nov 2018

Browse code

# 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

微修正

CleanArchitecture ForEasySignUp RemakeLoginFragment correct_design master

1 parent 4aeaa7d commit c3c1e1e2569cc8f607000d501fb8101f846d6e22

a-matsumoto authored on 8 Nov 2018

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View .idea/caches/build_file_checksums.ser
Not supported

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java

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

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java

Show line notes below