Anton Georgiev 4172537f24 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m ... Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml		2014-11-28 20:33:11 +00: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-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
bbb-webhooks	Webhooks: fix callbacks not being sent for create meeting events	2014-11-24 14:34:03 -02:00
demos	modified the url for routing to the sign in page	2014-11-13 08:46:39 -05:00
html5-embed	- add example in 3rd party html to lock unlock layout	2012-11-01 18:45:51 +00:00
meteor-client	must clear the chat tabs on logout	2014-11-28 16:41:00 +00: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