Merge remote-tracking branch 'origin/master' into NotificationsResource2
|
---|
src/main/java/org/ntlab/tampoposerver/models/ChatRequest.java 0 → 100644 |
---|
src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java |
---|
src/main/java/org/ntlab/tampoposerver/repositories/ChatRequestRepository.java 0 → 100644 |
---|
src/main/java/org/ntlab/tampoposerver/resources/ActivitiesResource.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/ChatRequestsResource.java 0 → 100644 |
---|
src/main/java/org/ntlab/tampoposerver/resources/FriendRequestsResource.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/FriendsResource.java |
---|
src/test/java/org/ntlab/tampoposerver/repositories/ActivityRepositoryTest.java |
---|