bigbluebutton-Github/bigbluebutton-html5
Oleksandr Zhurbenko 48e2bfbc53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
Conflicts:
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
2015-07-25 19:08:15 -07:00
..
app Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 2015-07-25 19:08:15 -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