diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-24 17:16:34 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-24 17:16:34 +0100 |
| commit | 3ae2fbb170ad0f2bfe1ebf7f59e76d3645861f0a (patch) | |
| tree | b01e2c881aaf744aaab0af613a7a26e7129f2028 /setup.cfg | |
| parent | enter captchas on webui (diff) | |
| parent | Rapidgator: fixed bug #47 (diff) | |
| download | pyload-3ae2fbb170ad0f2bfe1ebf7f59e76d3645861f0a.tar.xz | |
Merge remote-tracking branch 'origin/stable'
Conflicts:
module/plugins/accounts/FilesonicCom.py
module/plugins/accounts/OronCom.py
module/plugins/accounts/ShareonlineBiz.py
module/plugins/addons/UpdateManager.py
module/plugins/crypter/FilesonicComFolder.py
module/plugins/hoster/BezvadataCz.py
module/plugins/hoster/EuroshareEu.py
module/plugins/hoster/FilesonicCom.py
module/plugins/hoster/MegauploadCom.py
module/plugins/hoster/Premium4Me.py
module/plugins/hoster/YoutubeCom.py
module/plugins/internal/MultiHoster.py
module/utils.py
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions