Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into GroupListActivity
# Conflicts: # app/build.gradle
AchieveRequests
AddGroupByGroupID
AddGroupByGroupID2
AreaInformation
AreaInformationUpdate
CompareStoreLocation
CreateIntentService
DG_gitignore
DisplayGroupIDToInvite
DisplayGroupIDToInviteSecond
DisplayTitleRep
DisplaygID
GPSgetInService
GroupListActivity
JouinGroupLayoutRepair
LineInvite
MemberList
NotificationClass
RequestList
RequestListActivity
SearchResultDisplay
StoreLocationClass
UpdateRequestList
areaInfo
master
master_backup
removeDGBuild
searchNotificationsFix20191114
sendNotification
updateAreaInformation
|
---|
app/build.gradle |
---|