Kegan Dougal c91b642a8b Merge branch 'develop' into kegan/delete-empty-files ...

Conflicts:
	src/skins/vector/views/molecules/EventAsTextTile.js

2015-10-27 09:19:08 +00:00

..

controllers

Merge branch 'develop' into kegan/delete-empty-files

2015-10-27 09:19:08 +00:00

modules

Get conf calling working, apart from the end call button showing in the right room.

2015-09-30 18:22:15 +01:00

skins/vector

Merge branch 'develop' into kegan/delete-empty-files

2015-10-27 09:19:08 +00:00

vector

Fix typo in comment and remove console.log leftover from debugging

2015-10-12 17:41:56 +01:00

Avatar.js

Fix missing getAvatarUrlForMember

2015-10-20 11:49:21 +01:00

ContextualMenu.js

Make context menus point the right way

2015-10-21 19:02:02 +01:00