Merge remote-tracking branch 'origin/master' into NotificationsResource2
|
---|
src/main/java/org/ntlab/tampoposerver/models/Activity.java |
---|
src/main/java/org/ntlab/tampoposerver/models/Notification.java |
---|
src/main/java/org/ntlab/tampoposerver/models/User.java |
---|
src/main/java/org/ntlab/tampoposerver/repositories/FriendRepository.java 0 → 100644 |
---|
src/main/java/org/ntlab/tampoposerver/repositories/FriendRequestRepository.java 0 → 100644 |
---|
src/main/java/org/ntlab/tampoposerver/repositories/NotificationRepository.java |
---|
src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/ActivitiesResource.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/FriendRequestsResource.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/FriendsResource.java |
---|
src/test/java/org/ntlab/tampoposerver/models/UserTest.java 0 → 100644 |
---|
src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java 0 → 100644 |
---|