Merge branch 'master' of git+ssh://github.com/matrix-org/matrix-doc

This commit is contained in:
Matthew Hodgson 2015-12-14 08:40:47 +00:00
commit 2e7b3052c2
2 changed files with 3 additions and 3 deletions

View file

@ -394,7 +394,7 @@ paths:
"body": "Hello world!", "body": "Hello world!",
"msgtype": "m.text" "msgtype": "m.text"
}, },
"room_id:": "!wfgy43Sg4a:matrix.org", "room_id": "!wfgy43Sg4a:matrix.org",
"sender": "@bob:matrix.org", "sender": "@bob:matrix.org",
"event_id": "$asfDuShaf7Gafaw:matrix.org", "event_id": "$asfDuShaf7Gafaw:matrix.org",
"type": "m.room.message" "type": "m.room.message"

View file

@ -157,7 +157,7 @@ paths:
properties: properties:
count: count:
type: number type: number
description: Total number of results found description: An approximate count of the total number of results found.
results: results:
type: array type: array
title: Results title: Results
@ -298,7 +298,7 @@ paths:
} }
}, },
"next_batch": "5FdgFsd234dfgsdfFD", "next_batch": "5FdgFsd234dfgsdfFD",
"count": 24, "count": 1224,
"results": [ "results": [
{ {
"rank": 0.00424866, "rank": 0.00424866,