diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2014-06-07 15:20:12 +0200 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2014-06-07 15:20:12 +0200 |
commit | 24f5251cce172f0e403b4178819dd26b3873f021 (patch) | |
tree | d7748f7af049920740a58ac7b53ecef283a2d5bb /.travis.yml | |
parent | ac1390eee838d35b76d356e4e68bd430843d3439 (diff) | |
parent | b4e7447458770a705c064d0eb7f73f49dc885557 (diff) | |
download | youtube-dl-24f5251cce172f0e403b4178819dd26b3873f021.tar.xz |
Merge remote-tracking branch 'pulpe/teachertube'
Conflicts:
youtube_dl/extractor/__init__.py
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions