Fork: 0
nitta-lab-2019 / CosmosClient
Browse code
Merge branches 'login' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into login
# Conflicts:
#	app/src/main/AndroidManifest.xml
AchieveRequests AreaInformation AreaInformationUpdate CompareStoreLocation CreateIntentService DisplayTitleRep GPSgetInService GroupListActivity JouinGroupLayoutRepair LineInvite MemberList NotificationClass RequestList RequestListActivity StoreLocationClass UpdateRequestList areaInfo master searchNotificationsFix20191114 sendNotification updateAreaInformation
commit 7212b6f62710ed90c348723ff6462ced9cb70aa6
2 parents f89a1bc + 628cc5c
k-morimoto authored on 1 Oct 2019
Patch
Unified Split
Showing 1 changed file
View
app/src/main/AndroidManifest.xml