Erik Johnston 0b1b6057d6 Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing		2015-07-21 10:39:46 +01:00
..
atoms	rename EditableText's placeHolder parameter to be 'label' to avoid colliding with the HTML5 placeholder parameter	2015-07-20 20:11:33 -07:00
molecules	Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing	2015-07-21 10:39:46 +01:00
organisms	Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing	2015-07-21 10:39:46 +01:00
pages	rename DirectoryMenu as BottomLeftMenu and implement a really really really basic RoomDirectory	2015-07-20 20:11:33 -07:00
templates	fix up MemberInfo behaviour	2015-07-20 08:24:53 -07:00