Mark Haines a20a49abf6 Merge pull request #168 from matrix-org/markjh/client_config ... Add API for setting client config		2015-11-27 15:32:21 +00:00
..
v1	Merge pull request #168 from matrix-org/markjh/client_config	2015-11-27 15:32:21 +00:00
v2_alpha	Merge branch 'markjh/room_tags' into markjh/client_config	2015-11-26 16:56:39 +00:00