summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/hoster/BitshareCom.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable' into 0.4.10Gravatar Walter Purcaro 2014-10-051-1/+6
| | | | | | | | | | | | | Conflicts: module/plugins/internal/CaptchaService.py pyload/plugins/account/CyberlockerCh.py pyload/plugins/account/EgoFilesCom.py pyload/plugins/account/HotfileCom.py pyload/plugins/crypter/HotfileFolderCom.py pyload/plugins/crypter/LinkSaveIn.py pyload/plugins/crypter/OneKhDe.py pyload/plugins/hoster/EgoFilesCom.py pyload/plugins/internal/XFSPAccount.py
* Merge branch 'stable' into 0.4.10Gravatar Walter Purcaro 2014-10-031-5/+7
| | | | | | | | Conflicts: pyload/plugins/ocr/GigasizeCom.py pyload/plugins/ocr/LinksaveIn.py pyload/plugins/ocr/NetloadIn.py pyload/plugins/ocr/ShareonlineBiz.py
* module -> pyloadGravatar Walter Purcaro 2014-09-141-0/+151