perroned 2498eb9d32 Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition ... Conflicts: bigbluebutton-html5/app/client/globals.coffee		2015-10-27 11:45:43 -07:00
..
.meteor	merge conflicts	2015-10-06 12:11:43 -07:00
client	Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition	2015-10-27 11:45:43 -07:00
collections	Added the ability to send responses to polls back to the server	2015-07-30 17:08:12 -07:00
lib	Created a new collection named Polls, able to catch a message and save it there	2015-07-21 16:55:42 -07:00
public/packages/ionicons/fonts	update the ionicon ttf and woff	2015-04-16 13:51:59 +00:00
server	Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition	2015-10-27 11:45:43 -07:00
tests	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
config.coffee	Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition	2015-10-27 11:45:43 -07:00
packages.json	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
smart.json	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
smart.lock	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
start.sh	Update start.sh	2015-03-05 16:52:04 -05:00