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 3372045 commit 77c7f7a5c483f865a27f32d1fde95119bb4bfbd9
h-fuji authored on 2 Jul 2019
Patch
Unified Split
Showing 1 changed file
View
src/main/java/com/example/cosmos_serversb/models/Users.java