diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-03-29 23:41:40 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-03-29 23:41:40 +0200 |
| commit | dc65f738913827ddf38a91f046b92e519ebd677a (patch) | |
| tree | 8f2cc78fe8f45ab6c9bfa1c35e7fa0b3b2fdac0d /.gitattributes | |
| parent | pycurl.MAXREDIRS up to 10 (diff) | |
| parent | Avoid an expected error (diff) | |
| download | pyload-dc65f738913827ddf38a91f046b92e519ebd677a.tar.xz | |
Merge branch 'pr/n1156_ItachiSan' into 0.4.10
Conflicts:
pyload/manager/thread/Server.py
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions