Erik Johnston 1b6ca2b0ee Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing		2015-07-20 16:31:02 +01:00
..
css	Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing	2015-07-20 16:31:02 +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	add a MemberInfo list overlay as a mini user-profile page	2015-07-20 01:51:58 +01:00
views	Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing	2015-07-20 16:31:02 +01:00