David Baker ed738b6398 Merge pull request #15 from matrix-org/erikj/room_editing ... Show banned users in room settings		2015-07-21 08:14:25 -07:00
..
base	Merge pull request #15 from matrix-org/erikj/room_editing	2015-07-21 08:14:25 -07:00