You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Mark Haines 5bae15d47b Merge branch 'master' into markjh/room_tags ... Conflicts: api/client-server/v2_alpha/sync.yaml		10 years ago
..
definitions	/sync: Put state dict back to being a list	10 years ago
filter.yaml	typo	10 years ago
receipts.yaml	Fix the receipts API to be valid swagger	10 years ago
registration.yaml	Specify guest accounts	10 years ago
sync.yaml	Merge branch 'master' into markjh/room_tags	10 years ago
tags.yaml	Specify how ordering of tags is supposed to work	10 years ago