Oleksandr Zhurbenko da7242737b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-improvements ... Conflicts: bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee		2015-12-13 20:20:10 -08:00
..
app	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-improvements	2015-12-13 20:20:10 -08: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	Added the ability to run Jasmine tests with a single command.	2015-11-21 22:34:58 -08:00