Merge branch 'main' of github.com:Telecooperation/lecture-recording-m…

…anager
Telecooperation · Jun 17, 2021 · 97fe5c3 · 97fe5c3
2 parents 111b6f9 + 24b81b8
commit 97fe5c3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/README.md b/README.md
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/lecture-recording-manager/resources/ffmpeg/unix/x64/ffmpeg b/lecture-recording-manager/resources/ffmpeg/unix/x64/ffmpeg
diff --git a/lecture-recording-manager/resources/ffmpeg/unix/x86/ffmpeg b/lecture-recording-manager/resources/ffmpeg/unix/x86/ffmpeg