Merge remote-tracking branch 'origin/master' into modified-users-resource
commit e9e3a602fb8726f2798011eb2a1283a9bf9f955c
2 parents ce8e238 + 39de6c0
HataiShunsuke authored on 5 Jun
Showing 12 changed files
View
src/main/java/org/ntlab/tampoposerver/models/Activity.java
View
src/main/java/org/ntlab/tampoposerver/models/Notification.java
View
src/main/java/org/ntlab/tampoposerver/models/User.java
View
src/main/java/org/ntlab/tampoposerver/repositories/FriendRepository.java 0 → 100644
View
src/main/java/org/ntlab/tampoposerver/repositories/FriendRequestRepository.java 0 → 100644
View
src/main/java/org/ntlab/tampoposerver/repositories/NotificationRepository.java
View
src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java
View
src/main/java/org/ntlab/tampoposerver/resources/ActivitiesResource.java
View
src/main/java/org/ntlab/tampoposerver/resources/FriendRequestsResource.java
View
src/main/java/org/ntlab/tampoposerver/resources/FriendsResource.java
View
src/test/java/org/ntlab/tampoposerver/models/UserTest.java 0 → 100644
View
src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java 0 → 100644