David Baker 171d8b032f Merge branch 'voip' into develop ... Conflicts: webclient/room/room-controller.js		2014-08-29 11:33:36 +01:00
..
fileInput	Change mouse cursor to pointer on elements user can click on	2014-08-19 11:37:07 +02:00
fileUpload	Make the content repo work with in daemon mode. Return the full url on upload. Update the webclient to use new content repo api.	2014-08-22 10:25:32 +01:00
matrix	Merge branch 'voip' into develop	2014-08-29 11:33:36 +01:00
utilities	resizeImage: generate an image in the format of the original image. (Tested with tranparent PNG, transparent GIF, BMP, JPEG)	2014-08-22 10:48:00 +02:00