Merge branches 'fixAddMember' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosServer into fixAddMember

Fork: 0

nitta-lab-2019 / CosmosServer

Browse code Merge branches 'fixAddMember' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosServer into fixAddMember # Conflicts: # src/main/java/com/example/cosmos_serversb/entities/User.java COSMOS-462 COSMOS-469 COSMOS-478 CreateShopsRest CreateUsersHibernate chengeLogsProperty fixGetRequests master yolp
commit e29c48704b473f37842a579b79cb10495775c09c 2 parents ee09dc4 + aae7f48 n-kande authored on 25 Jul 2019

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/entities/Token.java

Ignore Space Show notes View src/main/java/com/example/cosmos_serversb/entities/User.java

Show line notes below