Merge branch 'markjh/account_data_filters' into markjh/room_filter

pull/977/head
Mark Haines 9 years ago
commit 2ea66e9300

@ -20,6 +20,10 @@ properties:
allOf:
- $ref: event_filter.yaml
description: The presence updates to include.
account_data:
allOf:
- $ref: event_filter.yaml
description: The user account data that isn't associated with rooms to include.
room:
properties:
ephemeral:
@ -38,5 +42,9 @@ properties:
allOf:
- $ref: room_event_filter.yaml
description: The message and state update events to include for rooms.
account_data:
allOf:
- $ref: room_event_filter.yaml
description: The per user account data to include for rooms.
type: object
type: object

Loading…
Cancel
Save