David Baker 91c0df4450 Merge branch 'master' into reactsdk-unfork		2015-09-28 11:32:40 +01:00
..
controllers	make presence work better on the memberlist. kludges around lack of syjs-28. is about as good as angular was now.	2015-09-24 01:58:21 +02:00
skins/vector	Merge branch 'master' into reactsdk-unfork	2015-09-28 11:32:40 +01:00
vector	Switch to webpack	2015-09-25 11:43:28 +01:00
Avatar.js	Remove unused stuff	2015-09-25 15:33:38 +01:00
CallHandler.js	More fixing up of paths, requires etc	2015-09-22 19:09:23 +01:00
ConferenceHandler.js	Add a FIXME explaining the situation around alternative FS ASes	2015-09-17 11:47:42 +01:00
ContextualMenu.js	Remove unused stuff	2015-09-25 15:33:38 +01:00