BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5d08f78ad5
bigbluebutton-Github/bigbluebutton-html5/app/.meteor
History
perroned 2d404323c6 Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/stylesheets/mixins.less
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/redispubsub.coffee
2015-12-09 08:40:13 -08:00
..
.finished-upgraders Updated Meteor. 2015-10-01 11:34:00 -07:00
.gitignore move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00
.id move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00
cordova-plugins Updated Meteor. 2015-10-01 11:34:00 -07:00
packages Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition 2015-12-09 08:40:13 -08:00
platforms move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00
release Updated Meteor. 2015-10-01 11:34:00 -07:00
versions Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition 2015-12-09 08:40:13 -08:00