Merge branch 'gh-pages' of /home/phihag/projects/youtube-dl/. into gh-pages

Browse Source

Conflicts:
	download.html
	update/LATEST_VERSION
	update/versions.json

pull/636/head

Philipp Hagemeister 12 years ago

parent efad35fb70 7aa6cb5973

commit 680adff87b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available