Fork: 0
nitta-lab-2025 / tampopo-server
Browse code
Merge remote-tracking branch 'origin/friends-resource2' into friends-resource2
# Conflicts:
#	build/classes/java/main/org/ntlab/tampoposerver/models/User.class
#	build/classes/java/main/org/ntlab/tampoposerver/repositories/UserRepository.class
#	src/main/java/org/ntlab/tampoposerver/resources/FriendsResource.java
ActivityRepository0729-1 Chatrooms Friendrequests_resource11 FriendsResource2 Hiroki111 activities-resource4 activities-resource5 fix-friend-service fix-icon-url fix-icon-url2 fixUserClassName fixUserFriendsMethods friendrequest_Resource10 friendrequestsresource111 hiroki3 master resolveActivitiesTypes restore-icon-url
commit f1619f6b5bc5e57de3d1ff31322daebf82d93232
2 parents 009751f + df95915
y-ichii authored on 17 Jun
Patch
Unified Split
Showing 3 changed files
View
.idea/uiDesigner.xml 0 → 100644
View
build/classes/java/main/org/ntlab/tampoposerver/models/User.class 100644 → 0
Not supported
View
build/classes/java/main/org/ntlab/tampoposerver/repositories/UserRepository.class 100644 → 0
Not supported