Oleksandr Zhurbenko a6e38c69f1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements ... Conflicts: bigbluebutton-html5/app/client/main.html bigbluebutton-html5/app/client/stylesheets/style.less		2015-11-04 15:47:14 -08:00
..
chat_bar.coffee	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements	2015-11-04 15:47:14 -08:00
chat_bar.html	Moving options' template to modal	2015-10-23 16:29:24 -07:00