bigbluebutton-Github/bigbluebutton-html5
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
..
app Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements 2015-11-04 15:47:14 -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 move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00