diff options
| author | Tithen-Firion <Tithen-Firion@users.noreply.github.com> | 2017-05-04 11:00:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-04 11:00:06 +0200 |
| commit | c89267d31ad99eb5b1a87cd354de5280a2a087b1 (patch) | |
| tree | 8bb3b01cd088d0646089344bddd3d4ff272c0065 /.gitignore | |
| parent | 7552f96352f35cd877e52fd0770b77ba1856fc62 (diff) | |
| parent | 0c265486016b06342fb257966474ce591667aaff (diff) | |
| download | youtube-dl-c89267d31ad99eb5b1a87cd354de5280a2a087b1.tar.xz | |
Merge branch 'master' into openload-phantomjs-method
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 9ce4b5e2d..a5b585f43 100644 --- a/.gitignore +++ b/.gitignore @@ -35,8 +35,8 @@ updates_key.pem *.mkv *.swf *.part +*.ytdl *.swp -test/testdata test/local_parameters.json .tox youtube-dl.zsh |