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

..

avatars

switch avatar initial layout to work with Open Sans

2015-11-30 17:15:02 +00:00

create_room

fix 'this' scoping bug that could never have worked...

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

dialogs

Move and merge LogoutPrompt

2015-11-30 15:23:16 +00:00

elements

More random tweaks

2015-12-23 16:02:18 +00:00

login

Auto-focus username box

2015-12-15 15:27:56 +00:00

messages

Merge pull request #73 from matrix-org/rav/on_highlight_click

2016-01-04 15:23:45 +00:00

rooms

Merge branch 'develop' into rav/new_search_api

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

settings

Review comments

2015-12-24 10:50:47 +00:00

voip

fix NPE

2015-12-17 11:56:41 +00:00