diff options
Diffstat (limited to 'doc/mapper spec.md')
| -rw-r--r-- | doc/mapper spec.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/mapper spec.md b/doc/mapper spec.md index f9b28fe94..725a0d6b2 100644 --- a/doc/mapper spec.md +++ b/doc/mapper spec.md @@ -1,5 +1,6 @@ itemmapper +<<<<<<< Updated upstream find(int $feedId, $userId) @@ -35,11 +36,20 @@ request: get all items of a feed of a user (unread and read) all requests: can be specified using an (offset (id), limit) or (updatedSince (timestamp)) +======= +findAllFromUser($userId) +find(int $feedId, $userId) + +findAll($status, $feedId, $userId, ); +>>>>>>> Stashed changes foldermapper find($feedId, $userId) +<<<<<<< Updated upstream findAllFromUser($userId) +======= +>>>>>>> Stashed changes feedmapper |