Richard van der Hoff 583d35e39f Merge branch 'develop' into rav/new_search_api ...

Conflicts:
	src/components/structures/RoomView.js

2016-01-05 15:38:30 +00:00

..

login

Pass a new prop 'startingQueryParams' to pluck out the email from the URL

2015-12-17 14:56:55 +00:00

CreateRoom.js

wire up RoomAlias's homeserver as intended

2015-12-28 02:36:28 +00:00

MatrixChat.js

General code cleanup / tweaks / fixes

2015-12-23 11:47:56 +00:00

RoomView.js

Merge branch 'develop' into rav/new_search_api

2016-01-05 15:38:30 +00:00

ScrollPanel.js

Merge pull request #70 from matrix-org/rav/scrollpanel_promises

2016-01-05 13:52:04 +00:00

UploadBar.js

svgize images

2015-12-06 22:07:49 +00:00

UserSettings.js

Wrangle CSS to get avatar in right place

2015-12-24 09:20:16 +00:00