Merge branch 'markjh/room_tags' into markjh/client_config

Conflicts:
	api/client-server/v2_alpha/sync.yaml
markjh/client_config
Mark Haines 9 years ago
commit c539b208f9

@ -274,7 +274,7 @@ paths:
"account_data": {
"events": [
{
"type": "m.tags",
"type": "m.tag",
"content": {"tags": {"work": {"order": 1}}}
},
{

Loading…
Cancel
Save