Merge branch 'master' into epel7

Conflicts: sources
10 years ago · d16adc929d
parent 936061e7f6 9f1bcdbb8f
commit d16adc929d
2 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -1 +1,2 @@
 43ecbbe6d932d55ed768ec170eb5b0fe  youtube-dl-2015.02.11.tar.gz.sig
 8922f062c1bae78997e08274fdf35d35  youtube-dl-2015.02.11.tar.gz
--- a/youtube-dl-2015.02.11.tar.gz.sig
+++ b/youtube-dl-2015.02.11.tar.gz.sig
`@ -1 +1,2 @@`
	`43ecbbe6d932d55ed768ec170eb5b0fe youtube-dl-2015.02.11.tar.gz.sig`	`43ecbbe6d932d55ed768ec170eb5b0fe youtube-dl-2015.02.11.tar.gz.sig`
		`8922f062c1bae78997e08274fdf35d35 youtube-dl-2015.02.11.tar.gz`