From: Tom-Oliver Heidel <redacted>
Date: Mon, 14 Sep 2020 11:24:18 +0000 (+0200)
Subject: Merge branch 'elonet' of https://github.com/tpikonen/youtube-dl into tpikonen-elonet
X-Git-Tag: 2021.01.07~157^2
X-Git-Url: https://jfr.im/git/yt-dlp.git/commitdiff_plain/c11c64f318c6b9361eb8d8c855697499f7a1cba7

Merge branch 'elonet' of https://github.com/tpikonen/youtube-dl into tpikonen-elonet
---

c11c64f318c6b9361eb8d8c855697499f7a1cba7
diff --cc youtube_dlc/extractor/elonet.py
index 000000000,c64ab5de3..c64ab5de3
mode 000000,100644..100644
--- a/youtube_dlc/extractor/elonet.py
+++ b/youtube_dlc/extractor/elonet.py