diff options
author | 2015-04-30 19:44:58 +0200 | |
---|---|---|
committer | 2015-04-30 19:44:58 +0200 | |
commit | 6305978099142fbe306d308877946c570fb4e98f (patch) | |
tree | 4264f9e17179e2aa26775c6dd448576d6c628ddf /pyload/plugin/hoster/Ftp.py | |
parent | Revert colored console (diff) | |
parent | Spare code cosmetics (diff) | |
download | pyload-6305978099142fbe306d308877946c570fb4e98f.tar.xz |
Merge branch 'stable' into 0.4.10
Conflicts:
pyload/plugin/crypter/FilecryptCc.py
pyload/plugin/hoster/Ftp.py
pyload/plugin/hoster/UpleaCom.py
pyload/plugin/hoster/UploadedTo.py
pyload/plugin/internal/BasePlugin.py
pyload/plugin/internal/SimpleHoster.py
Diffstat (limited to 'pyload/plugin/hoster/Ftp.py')
-rw-r--r-- | pyload/plugin/hoster/Ftp.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyload/plugin/hoster/Ftp.py b/pyload/plugin/hoster/Ftp.py index 86049df04..1ebfdebd0 100644 --- a/pyload/plugin/hoster/Ftp.py +++ b/pyload/plugin/hoster/Ftp.py @@ -12,7 +12,7 @@ from pyload.plugin.Hoster import Hoster class Ftp(Hoster): __name = "Ftp" __type = "hoster" - __version = "0.49" + __version = "0.50" __pattern = r'(?:ftps?|sftp)://([\w.-]+(:[\w.-]+)?@)?[\w.-]+(:\d+)?/.+' |