Merge branch 'Signup' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2020/org.ntlab.amaryllis.client
# Conflicts: # app/src/main/AndroidManifest.xml
1001
1008
10261
10262
10263
1029
10291
10292
1110
11101
2020
CategoryRest
Dialog(Category)
PLM
PLM2
PlayListManager
Playbutton
Shinji_1105
Signup
VoiceEdit
VoiceTest
VoiceTest2
acfrag
category
crrentlocation
fragment-maps
main-screen
master
miyazaki1110
miyazaki1112
miyazaki1112_2
present-location
set_category
shinji10_26
shinji11_12
shinji_1013
shinji_1022_
test
test11/12
voice_location
voicememo_1112
|
---|
.idea/gradle.xml |
---|
.idea/misc.xml |
---|
app/src/main/AndroidManifest.xml |
---|
app/src/main/java/org/ntlab/amaryllis/client/SignupActivity.java |
---|
app/src/main/res/layout/activity_signup.xml |
---|
build.gradle |
---|