Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'stable' into 0.4.10 | Walter Purcaro | 2014-09-28 | 68 | -392/+328 |
| | | | | | | | | | | | | | | | | | Conflicts: pyload/plugins/crypter/MultiuploadCom.py pyload/plugins/crypter/SerienjunkiesOrg.py pyload/plugins/hooks/ExternalScripts.py pyload/plugins/hooks/ExtractArchive.py pyload/plugins/hooks/MergeFiles.py pyload/plugins/hoster/CatShareNet.py pyload/plugins/hoster/FilezyNet.py pyload/plugins/hoster/IFileWs.py pyload/plugins/hoster/PremiumTo.py pyload/plugins/hoster/SpeedyshareCom.py pyload/plugins/hoster/UptoboxCom.py pyload/plugins/hoster/XFileSharingPro.py pyload/plugins/hoster/ZippyshareCom.py | ||||
* | Merge remote-tracking branch 'pyload/stable' into 0.4.10 | Walter Purcaro | 2014-09-14 | 3 | -16/+21 |
| | | | | | | | | | | | | | | | | | | | | Conflicts: module/plugins/accounts/MultiDebridCom.py module/plugins/accounts/MyfastfileCom.py module/plugins/hooks/MultiDebridCom.py module/plugins/hooks/MyfastfileCom.py module/plugins/hooks/Premium4Me.py module/plugins/hooks/PremiumTo.py module/plugins/hoster/MultiDebridCom.py module/plugins/hoster/MyfastfileCom.py module/plugins/hoster/Premium4Me.py module/plugins/hoster/PremiumTo.py pyload/plugins/accounts/MultiDebridCom.py pyload/plugins/accounts/Premium4Me.py pyload/plugins/hooks/MultiDebridCom.py pyload/plugins/hooks/Premium4Me.py pyload/plugins/hoster/MultiDebridCom.py pyload/plugins/hoster/Premium4Me.py | ||||
* | Restructure pyload file tree (1) | Walter Purcaro | 2014-09-14 | 29 | -32/+32 |
| | |||||
* | [Lib] Update simplejson to v3.6.3 + one file wsgiserver + importing fixup | Walter Purcaro | 2014-09-14 | 1 | -1/+1 |
| | |||||
* | module -> pyload | Walter Purcaro | 2014-09-14 | 167 | -0/+11811 |