Erik Johnston 89f6459915 Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing

2015-07-21 14:14:48 +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 14:14:48 +01:00

organisms

Use getDefaultProps instead of setting porps

2015-07-21 14:14:15 +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 the client-peg clean up to match the changes vector has made to the sdk

2015-07-20 14:28:02 +01:00