Ghazi Triki 7d283cd154 Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x ... # Conflicts: # bigbluebutton-client/resources/config.xml.template # bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as # bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml # record-and-playback/core/scripts/rap-process-worker.rb		2017-05-22 17:35:24 +01:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x	2017-05-22 17:35:24 +01:00
config.xml.template	Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x	2017-05-22 17:35:24 +01:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00