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
..
features	Remove a few matterhorn references that were missed.	2016-09-02 17:45:10 -04:00
lib	Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1	2017-04-04 20:42:15 +00:00
resources/raw	- extract metadata from events.xml and generate index.html in publish dir for simple playback	2011-05-24 18:16:54 -04:00
scripts	Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x	2017-05-22 17:35:24 +01:00
spec	Remove a bunch of unused/old audio processing code.	2016-09-02 16:40:27 -04:00
systemd	Moved the recording systemd scripts into the core directory	2017-03-23 10:36:10 -05:00
Gemfile	Merge remote-tracking branch 'mconf/mconf'	2017-03-20 19:45:59 +00:00
Gemfile.lock	Merge remote-tracking branch 'mconf/mconf'	2017-03-20 19:45:59 +00:00