danielpetri1 5fff226d55 Remove leftover diff from merge conflict		2023-11-19 18:43:21 +00:00
..
features	Remove a few matterhorn references that were missed.	2016-09-02 17:45:10 -04:00
lib	Remove leftover diff from merge conflict	2023-11-19 18:43:21 +00:00
resources/raw	recording: Anonymize names in chat	2021-09-02 15:02:27 -04:00
scripts	Resolve conflicts	2023-09-11 11:25:56 -03:00
spec	Include webrtc webcams in recording processing	2018-04-24 15:20:35 -04:00
systemd	Merge tag 'v2.5.3' into merge25-26-jul14	2022-07-15 11:08:02 -03:00
test/recordandplayback	recording: Enforce minimum length of video segments	2023-02-16 11:46:45 -05:00
.gitignore	recording: Anonymize names in chat	2021-09-02 15:02:27 -04:00
Gemfile	fix: record-and-playback/core/Gemfile & record-and-playback/core/Gemfile.lock to reduce vulnerabilities	2023-08-20 20:05:57 +00:00
Gemfile.lock	fix: record-and-playback/core/Gemfile & record-and-playback/core/Gemfile.lock to reduce vulnerabilities	2023-08-20 20:05:57 +00:00
Rakefile	recording: Anonymize names in chat	2021-09-02 15:02:27 -04:00