Leonardo Crauss Daronco 62d62a2a1e Merge remote-tracking branch 'upstream/master' into v2.0-rap-on-resque ... # Conflicts: # bigbluebutton-config/bin/bbb-conf # record-and-playback/core/Gemfile.lock # record-and-playback/core/lib/recordandplayback/events_archiver.rb # record-and-playback/core/scripts/archive/archive.rb # record-and-playback/core/scripts/bigbluebutton.yml # record-and-playback/core/scripts/rap-process-worker.rb # record-and-playback/core/scripts/rap-publish-worker.rb # record-and-playback/core/scripts/rap-sanity-worker.rb # record-and-playback/core/scripts/rap-starter.rb # record-and-playback/core/scripts/sanity/sanity.rb # record-and-playback/core/systemd/bbb-rap-archive-worker.service # record-and-playback/core/systemd/bbb-rap-process-worker.service # record-and-playback/core/systemd/bbb-rap-publish-worker.service # record-and-playback/core/systemd/bbb-rap-sanity-worker.service # record-and-playback/core/systemd/bbb-record-core.target		2019-12-04 17:33:44 -03:00
..
sanity.rb	Merge remote-tracking branch 'upstream/master' into v2.0-rap-on-resque	2019-12-04 17:33:44 -03:00