Merge branch 'master' into daniel/threepidinvites-2

This commit is contained in:
Daniel Wagner-Hall 2015-09-14 17:08:22 +01:00
commit b916823d0f
4 changed files with 62 additions and 16 deletions

View file

@ -285,8 +285,11 @@ paths:
chunk:
type: array
description: |-
A list of the most recent messages for this room. This
array will consist of at most ``limit`` elements.
If the user is a member of the room this will be a
list of the most recent messages for this room. If
the user has left the room this will be the
messages that preceeded them leaving. This array
will consist of at most ``limit`` elements.
items:
type: object
title: RoomEvent
@ -296,8 +299,10 @@ paths:
state:
type: array
description: |-
A list of state events representing the current state
of the room.
If the user is a member of the room this will be the
current state of the room as a list of events. If the
user has left the room this will be the state of the
room when they left it.
items:
title: StateEvent
type: object
@ -347,4 +352,4 @@ paths:
allOf:
- "$ref": "definitions/event.yaml"
404:
description: The event was not found or you do not have permission to read this event.
description: The event was not found or you do not have permission to read this event.