Merge remote-tracking branch 'remotes/origin/master' into DisplayGroupIDToInvite

Fork: 0

nitta-lab-2019 / CosmosClient

Browse code Merge remote-tracking branch 'remotes/origin/master' into DisplayGroupIDToInvite # Conflicts: # app/src/main/AndroidManifest.xml DisplayGroupIDToInvite
1 parent ad3201d commit a4dbbefed0668c79c2e28775a8d80605190e01d2 t-tai authored on 18 Jul 2019

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/JoinGroupResponse.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java

Show line notes below