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 · 2015-11-26 16:56:39 +00:00 · c539b208f9
commit c539b208f9
parent 5ccc39b850 d39494b6df
1 changed files with 1 additions and 1 deletions
--- a/api/client-server/v2_alpha/sync.yaml
+++ b/api/client-server/v2_alpha/sync.yaml
@ -274,7 +274,7 @@ paths:
                      "account_data": {
                        "events": [
                          {
-                            "type": "m.tags",
+                            "type": "m.tag",
                            "content": {"tags": {"work": {"order": 1}}}
                          },
                          {