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 Signup
Conflicts:
	app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java
1001 1008 10261 10262 10263 1029 10291 10292 1110 11101 2020 CategoryRest Dialog(Category) PLM PLM2 PlayListManager Playbutton Shinji_1105 Signup VoiceEdit 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
commit 9917f0a4cbfe41156beccb83ff5e3f072b05468d
2 parents 97fe2ae + 2d1236f
淺野湧悟 authored on 23 Jun 2020
Patch
Unified Split
Showing 4 changed files
View
app/src/main/java/org/ntlab/amaryllis/client/entities/AccountDeleteResponse.java 0 → 100644
View
app/src/main/java/org/ntlab/amaryllis/client/entities/AccountsDetailResponse.java 0 → 100644
View
app/src/main/java/org/ntlab/amaryllis/client/entities/GetFollowingsResponse.java 0 → 100644
View
app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java