gcampes 16c8497e36 Merge remote-tracking branch 'upstream/master' into unauthorized-page-fix ... * upstream/master: (26 commits) Fix lint issues Fix lint issues Fix a few lint problems fix missing import causing breakouts to not work Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded. Fix poll options remain visible on html5, closes #3806 HTML5 - user internal userId instead of external userId in register user message remove unnecessarily added svgs updated icons to v11, adjusted few icons Fix merge algoritm problem set chat input color to gray (text-color) Fixed user leave problem on private chat, close #3799 HTML5 align emojis horizontally Check userId when validating token Cleanup - remove extra > on meeting name on getRecording API response Check for WebRTC availability instead of checking for the browser name to display the AudioSelectionWindow browser hint. Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used. improved logic for updating message-list Change to fetch from chat system id, issue #3792 HTML5 Fix multiple welcome messages, issue #3792 HTML5 ...		2017-04-17 14:15:40 -03:00
..
server	Merge remote-tracking branch 'upstream/master' into unauthorized-page-fix	2017-04-17 14:15:40 -03:00
index.js	Moves to api/collection/index	2016-05-16 09:14:02 -05:00