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
..
molecules/voip	add remoteAudioElement	2015-10-21 01:23:15 +01:00
organisms	Fix event listener leak	2015-10-26 10:30:12 +00:00
templates	Use ChangeDisplayNname / ChangeAvatar widgets to prompt for display name & avatar at signup.	2015-10-09 11:56:16 +01:00