| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Merges vuolter/pyload@a50c8ff
(cherry picked from commit 0424017acbd34e14a33002e130c618c5dd6df222)
Conflicts:
module/plugins/PluginManager.py
module/plugins/captcha/LinksaveIn.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Merges vuolter/pyload@74bcc70
(cherry picked from commit cca4127f9853ab029cbf0b55fedced124400952d)
Conflicts:
module/plugins/Account.py
module/plugins/Container.py
module/plugins/Crypter.py
module/plugins/Hook.py
module/plugins/Plugin.py
module/plugins/container/LinkList.py
pyload/plugins/crypter/HoerbuchIn.py
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(cherry picked from commit 669b1e0ec048e1ed8aeb842b2570376e9ad96863)
Conflicts:
pyload/plugins/addons/CaptchaTrader.py
pyload/plugins/addons/ClickAndLoad.py
pyload/plugins/addons/Ev0InFetcher.py
pyload/plugins/addons/ExternalScripts.py
pyload/plugins/addons/ExtractArchive.py
pyload/plugins/addons/HotFolder.py
pyload/plugins/addons/MergeFiles.py
pyload/plugins/addons/MultiHome.py
pyload/plugins/addons/XMPPInterface.py
|
|
|