Mark Haines c539b208f9 Merge branch 'markjh/room_tags' into markjh/client_config ... Conflicts: api/client-server/v2_alpha/sync.yaml		2015-11-26 16:56:39 +00:00
..
definitions	/sync: Put state dict back to being a list	2015-11-18 16:17:29 +00:00
account-data.yaml	Say that type is an event type	2015-11-20 18:45:09 +00:00
filter.yaml	typo	2015-10-29 02:11:47 +00:00
receipts.yaml	Fix the receipts API to be valid swagger	2015-10-06 17:40:45 +01:00
registration.yaml	Specify guest accounts	2015-11-02 15:26:06 +00:00
sync.yaml	Merge branch 'markjh/room_tags' into markjh/client_config	2015-11-26 16:56:39 +00:00
tags.yaml	Specify how ordering of tags is supposed to work	2015-11-16 17:04:19 +00:00