Fork: 0
nitta-lab-2019 / CosmosClient
Browse code
Merge remote-tracking branch 'remotes/origin/master' into AddMember
# Conflicts:
#	app/src/main/res/values/strings.xml
#	gradle/wrapper/gradle-wrapper.properties
AchieveRequests AddGroupByGroupID AddGroupByGroupID2 AreaInformation AreaInformationUpdate CompareStoreLocation CreateIntentService DG_gitignore DisplayGroupIDToInvite DisplayGroupIDToInviteSecond DisplayTitleRep DisplaygID GPSgetInService GroupListActivity JacksonTest JouinGroupLayoutRepair LineInvite MemberList NotificationClass RequestList RequestListActivity RetrofitSample SearchResultDisplay StoreLocationClass UpdateRequestList app areaInfo groupListErorFix master master_backup removeDGBuild searchNotificationsFix20191114 sendNotification updateAreaInformation
commit 229ab2ecff28790d6fce33b93e4ead9b8f2444dd
2 parents f57b82c + 0e5008b
t-tai authored on 23 May 2019
Patch
Unified Split
Showing 2 changed files
View
app/src/main/res/values/strings.xml
View
gradle/wrapper/gradle-wrapper.properties