perroned 59bcb84b9d Merge remote-tracking branch 'anton/meteor-rebuild-server' into creating-better-templates ... Conflicts: labs/meteor-client/client/globals.coffee labs/meteor-client/client/main.coffee labs/meteor-client/client/views/whiteboard/whiteboard.html labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee		2014-08-13 13:56:04 -07:00
..
api	Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master	2014-05-12 17:31:35 +00:00
applet-jni	Initial commit of applet-jni test.	2012-08-03 07:22:16 -03:00
bbb-api-php	Add send XML in createMeetingWithXmlResponseArray	2014-05-03 22:29:59 +04:00
bbb-api-php-legacy	Updated README on bbb-api-php and bbb-api-php-legacy placed in labs	2012-04-05 11:07:10 -04:00
bbb-callback	- add more logging	2013-11-04 07:30:26 -08:00
bbb-deskshare-installer	Initial commit of installer folder.	2012-08-07 12:07:11 -03:00
bbb-deskshare-udp	Initial Commit	2012-08-06 17:16:47 -03:00
demos	stop sending userName and meetingName via the URL. Now we can obtain them from bbb-apps and the Collections	2014-07-03 20:50:24 +00:00
html5-embed	- add example in 3rd party html to lock unlock layout	2012-11-01 18:45:51 +00:00
meteor-client	Merge remote-tracking branch 'anton/meteor-rebuild-server' into creating-better-templates	2014-08-13 13:56:04 -07:00
stress-testing	Fixed typo that prevented wget from making API call	2014-02-03 11:51:55 -05:00
webminer	- cleanup and move webminer into labs	2011-05-22 15:59:33 -04:00