Merge branch 'master' into accountsrest
# Conflicts: # src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostsRest.java |
---|
src/main/java/org/ntlab/nemophila/models/accounts/Account.java |
---|
src/main/java/org/ntlab/nemophila/models/accounts/Post.java |
---|
src/main/java/org/ntlab/nemophila/resources/accounts/AccountPostsRest.java |
---|
src/main/java/org/ntlab/nemophila/resources/accounts/RequestingRest.java |
---|
src/main/java/org/ntlab/nemophila/resources/shops/ShopPostsRest.java |
---|