aboutsummaryrefslogtreecommitdiff
path: root/setup.cfg
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-03-09 03:01:28 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-03-09 03:01:28 +0100
commitdcca5819675df1e9d9a1caf00af0f98bb2ce511c (patch)
tree47523d0851107978072ca6dd5c982dafe7abff47 /setup.cfg
parentd475b3384cd372d89c35b9b1c26499f1e9cc1915 (diff)
parentdd7831fe94a0fb8270e7fa3699677c7476a5cd83 (diff)
Merge remote-tracking branch 'origin/master'
Conflicts: youtube_dl/YoutubeDL.py
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions