Fork: 0
nitta-lab-2020 / org.ntlab.amaryllis.client
Browse code
Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2020/org.ntlab.amaryllis.client into Dialog(Category)
Conflicts:
	app/src/main/java/org/ntlab/amaryllis/client/fragment/MapsFragment.java
Dialog(Category) master miyazaki1112_2 test test11/12
commit e78817db75d687f25f680b769f559cf9855607ad
2 parents 6abf24a + c087af4
h-fuji authored on 12 Nov 2020
Patch
Unified Split
Showing 2 changed files
View
app/src/main/java/org/ntlab/amaryllis/client/MainActivity.java
View
app/src/main/java/org/ntlab/amaryllis/client/voiceservice/PlayListManager.java