Merge remote-tracking branch 'remotes/origin/master' into voice-test

Fork: 0

nitta-lab-2020 / org.ntlab.amaryllis.client

Browse code Merge remote-tracking branch 'remotes/origin/master' into voice-test # Conflicts: # app/build.gradle 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
1 parent 12dd08c commit 3dc897c834b64a31f2a3f2782f6d2b708994c9d3 Ninja Team authored on 12 Jun 2020

Browse code

# Conflicts:
#	app/build.gradle

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

1 parent 12dd08c commit 3dc897c834b64a31f2a3f2782f6d2b708994c9d3

Ninja Team authored on 12 Jun 2020

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View app/build.gradle

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Show line notes below