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

..

css

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

2015-07-21 10:39:46 +01:00

fonts

don't depend on google for fonts, given i'm on inflight wifi...

2015-07-20 08:24:53 -07:00

img

lipstick for hangup button and typing notifs

2015-07-20 12:09:24 -07:00

views

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

2015-07-21 10:39:46 +01:00