Daniel Wagner-Hall bc514dc9c4 Merge pull request #178 from matrix-org/daniel/directory ... Fix and include /directory api docs		2015-11-27 16:21:15 +00:00
..
v1	Merge pull request #178 from matrix-org/daniel/directory	2015-11-27 16:21:15 +00:00
v2_alpha	Merge branch 'markjh/room_tags' into markjh/client_config	2015-11-26 16:56:39 +00:00