Gabriel Carvalho de Campes 537d8753fe Merge remote-tracking branch 'origin/master' into router-changes ... * origin/master: upgrade sip.js to 0.7.5 Moved polling files back to components folder Fixed a small issue with reduce() in the poll annotation Made polling buttons accessible Updated packages and fixed some of the warnings introduced by React 15.2.0 Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04) Centering polling buttons Title and calculated styling for the polling UI Mark open chat as active Remove some old code Changes the way user actions are rendered Replaced polling under the whiteboard Solve issues from github comments Remove color-generator because it is not being used polish code Updates the userlist Conflicts: bigbluebutton-html5/imports/ui/components/app/container.jsx		2016-07-08 11:59:05 +00:00
..
helpers.js	Merge remote-tracking branch 'origin/master' into router-changes	2016-07-08 11:59:05 +00:00