| Commit message (Collapse) | Author | Age | Files | Lines | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Merges vuolter/pyload@aa7b3f9
(cherry picked from commit 5fed2b0180b95eed9ee82f82dff1a5bf8c66c2f5)
Conflicts:
	module/plugins/AccountManager.py
	module/plugins/ReCaptcha.py
	module/plugins/captcha/GigasizeCom.py
	module/plugins/captcha/LinksaveIn.py
	module/plugins/container/LinkList.py
	module/plugins/hooks/MultiDebridCom.py
	module/plugins/hooks/UnrestrictLi.py
	module/plugins/internal/MultiHoster.py
	pyload/plugins/accounts/Premium4Me.py
	pyload/plugins/accounts/PremiumizeMe.py
	pyload/plugins/internal/NetloadInOCR.py
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Merges vuolter/pyload@83ff313
(cherry picked from commit d27113cef108461e2363cc4c88c4a1d01222c9e9)
Conflicts:
	module/plugins/Hook.py
	module/plugins/hooks/MultiDebridCom.py
	module/plugins/hooks/UnrestrictLi.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
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Merges vuolter/pyload@6c57a37
(cherry picked from commit ce955b6c04f6ddaab1696c6cabf5e0aa83cbf846)
Conflicts:
	module/plugins/Account.py
	module/plugins/Container.py
	module/plugins/Crypter.py
	module/plugins/Hoster.py
	module/plugins/hooks/MultiDebridCom.py
	module/plugins/hooks/UnrestrictLi.py
 | 
| | 
| 
| 
|  | 
(cherry picked from commit 7e44d40af3b2574eae04e1df3b40f536776593c8)
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
(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
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
Conflicts:
	module/plugins/accounts/Premium4Me.py
	pyload/plugins/addons/Premium4Me.py
	pyload/plugins/crypter/NCryptIn.py
	pyload/plugins/hooks/Captcha9kw.py
	pyload/plugins/hoster/Premium4Me.py
	pyload/plugins/hoster/Xdcc.py
	pyload/plugins/hoster/XvidstageCom.py
 | 
|    | 
 |