perroned 554ce1d06b Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call ... Conflicts: bigbluebutton-html5/app/client/main.html bigbluebutton-html5/app/client/stylesheets/style.less bigbluebutton-html5/app/client/views/chat/chat_bar.html		2015-04-22 06:03:46 -07:00
..
app	Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call	2015-04-22 06:03:46 -07:00
log	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
.gitignore	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
grunt-instructions.txt	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
Gruntfile.js	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
package.json	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00