diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-10-03 17:40:27 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-10-03 17:40:27 +0200 |
| commit | cdd7d2db6b372a38a6b4281f19881b95aa5b7a50 (patch) | |
| tree | 9b9e29d2f85e99ef558f49d3c33ebad6ff69552c /pyload/network/__init__.py | |
| parent | Changed XFileSharingPro and UpdateManager to internal plugins (diff) | |
| parent | [Dev-Host] Improve patterns a bit (diff) | |
| download | pyload-cdd7d2db6b372a38a6b4281f19881b95aa5b7a50.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
pyload/plugins/ocr/GigasizeCom.py
pyload/plugins/ocr/LinksaveIn.py
pyload/plugins/ocr/NetloadIn.py
pyload/plugins/ocr/ShareonlineBiz.py
Diffstat (limited to 'pyload/network/__init__.py')
0 files changed, 0 insertions, 0 deletions