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
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton	2014-11-17 21:36:27 +00:00
config.xml.template	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-chat-translation	2014-11-26 09:14:18 -08:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00