diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-04-28 23:49:50 +0200 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-04-28 23:49:50 +0200 |
commit | 5f6b4c94c9edf03849d06cddad33fac5fdaa98cf (patch) | |
tree | 4338ca87babaef9f4af5a98154f5a741bba8f54e /.gitignore | |
parent | 5dacf4d61197df1f8941949ba872ffc8ab13486f (diff) | |
parent | e7db6759e4c4ca5099a997285642e60b84eee2c6 (diff) | |
download | youtube-dl-5f6b4c94c9edf03849d06cddad33fac5fdaa98cf.zip youtube-dl-5f6b4c94c9edf03849d06cddad33fac5fdaa98cf.tar.gz youtube-dl-5f6b4c94c9edf03849d06cddad33fac5fdaa98cf.tar.bz2 |
Merge branch 'upstream'
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -35,8 +35,8 @@ updates_key.pem *.mkv *.swf *.part +*.ytdl *.swp -test/testdata test/local_parameters.json .tox youtube-dl.zsh |