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
..
collection_methods	Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition	2015-10-27 11:45:43 -07:00
bbblogger.coffee	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
publish.coffee	Added handling for 'user_voted_poll_message'	2015-08-01 12:27:01 -07:00
redispubsub.coffee	Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition	2015-10-27 11:45:43 -07:00
server.coffee	Putting everything in order	2015-08-16 15:19:43 -07:00
user_permissions.coffee	Added the ability to set emoji status.	2015-10-01 12:41:43 -07:00