diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-06 00:31:46 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-05-06 00:31:46 +0200 |
| commit | 8d60ae2be14be54d4f4d4775fe696a82f84a000c (patch) | |
| tree | 57e3da3c2ac9e18d04366c833259cee39635dc7b /module/web/pyload_app.py | |
| parent | Auto choose webserver (diff) | |
| parent | [SimpleHoster] Fallback option (diff) | |
| download | pyload-8d60ae2be14be54d4f4d4775fe696a82f84a000c.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
pyload/plugin/addon/AntiVirus.py
pyload/plugin/addon/ExtractArchive.py
pyload/plugin/hoster/GoogledriveCom.py
pyload/plugin/hoster/OneFichierCom.py
pyload/plugin/hoster/UlozTo.py
pyload/plugin/hoster/YadiSk.py
pyload/plugin/hoster/ZippyshareCom.py
pyload/plugin/internal/SimpleHoster.py
pyload/plugin/internal/XFSCrypter.py
pyload/plugin/internal/XFSHoster.py
Diffstat (limited to 'module/web/pyload_app.py')
0 files changed, 0 insertions, 0 deletions