Merge branch 'master' of github.com:AnonymusRaccoon/Kyoo into dev

This commit is contained in:
Zoe Roux 2021-01-24 20:32:21 +01:00
commit f8546ebf64

4
.gitmodules vendored
View File

@ -1,8 +1,8 @@
[submodule "transcoder"] [submodule "transcoder"]
path = transcoder path = transcoder
url = https://github.com/AnonymusRaccoon/Kyoo.Transcoder url = ../Kyoo.Transcoder.git
branch = master branch = master
[submodule "WebApp"] [submodule "WebApp"]
path = Kyoo/Views/WebClient path = Kyoo/Views/WebClient
url = https://github.com/AnonymusRaccoon/Kyoo.WebApp url = ../Kyoo.WebApp.git
branch = master branch = master