bigbluebutton-Github/bigbluebutton-html5
Maxim Khlobystov f4418f6109 Merge branch 'meteor-ui' of https://github.com/OZhurbenko/bigbluebutton into meteor-client-new-ui
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
2015-05-08 12:07:07 -04:00
..
app Merge branch 'meteor-ui' of https://github.com/OZhurbenko/bigbluebutton into meteor-client-new-ui 2015-05-08 12:07:07 -04: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