Merge remote-tracking branch 'origin/master' · sealedtx/java-youtube-downloader@930a237 · GitHub

Commit

Merge remote-tracking branch 'origin/master'

Browse files

# Conflicts:
#	src/main/java/com/github/kiulian/downloader/model/YoutubeVideo.java
#	src/test/java/com/github/kiulian/downloader/YoutubeDownloader_Tests.java

Loading branch information

sealedtx committed Jun 17, 2021

2 parents fcca1f4 + 24076b4 commit 930a237