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
1 parent 229ab2e commit 99e3741d75d4d1a5da01a6eb444cefdd0c926c8b
t-tai authored on 23 May 2019
Patch
Unified Split
Showing 5 changed files
View
app/src/main/java/com/example/cosmosclient/views/SigninActivity.java 0 → 100644
View
app/src/main/java/com/example/cosmosclient/views/SignupActivity.java 0 → 100644
View
app/src/main/res/drawable/borderless_button.xml 0 → 100644
View
app/src/main/res/layout/activity_signin.xml 0 → 100644
View
app/src/main/res/layout/activity_signup.xml 0 → 100644