Merge remote-tracking branch 'remotes/origin/master' into Shinji_1105

Fork: 0

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

Browse code Merge remote-tracking branch 'remotes/origin/master' into Shinji_1105 # Conflicts: # app/src/main/java/org/ntlab/amaryllis/client/voiceservice/TestVoiceService.java Dialog(Category) PLM PLM2 Shinji_1105 master miyazaki1112 miyazaki1112_2 shinji11_12 test test11/12
commit 341fae156f75b204b8899b00267b16ae6de26bdb 2 parents 2679baa + 85a2747 Shinji authored on 12 Nov 2020

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/entities/AmaryllisBackgroundService.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/resources/VoicememosRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java

Ignore Space Show notes View app/src/main/res/layout/activity_login.xml

Ignore Space Show notes View app/src/main/res/layout/activity_main.xml

Ignore Space Show notes View app/src/main/res/layout/activity_signup.xml

Ignore Space Show notes View app/src/main/res/menu/nav_drawer_menu.xml 0 → 100644

Show line notes below