Fork: 0
nitta-lab-2019 / CosmosServer
Browse code
Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosServer into CreateUsersHibernate
# Conflicts:
#	src/main/java/com/example/cosmos_serversb/entities/User.java
COSMOS-462 COSMOS-469 COSMOS-478 CreateShopsRest CreateUsersHibernate RequesetUser chengeLogsProperty fixGetRequests getRequestsListByGid master yolp
1 parent 77c7f7a commit de5f1bf65322704a104a42b90544963287e5569a
h-fuji authored on 2 Jul 2019
Patch
Unified Split
Showing 3 changed files
View
src/main/java/com/example/cosmos_serversb/entities/GetUser.java 100644 → 0
View
src/main/java/com/example/cosmos_serversb/entities/PutUser.java 100644 → 0
View
src/main/java/com/example/cosmos_serversb/models/Users.java