Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-13 15:04:10 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'markjh/room_tags' into markjh/client_config

Browse source 
Conflicts:
	api/client-server/v2_alpha/sync.yaml
This commit is contained in:
Mark Haines 2015-11-26 16:56:39 +00:00
parent 5ccc39b850 d39494b6df
commit c539b208f9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/client-server/v2_alpha/sync.yaml
View file

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