diff options
| author | Mustufa Rangwala (OpenERP) <mra@tinyerp.com> | 2012-08-03 10:48:59 +0530 |
|---|---|---|
| committer | Mustufa Rangwala (OpenERP) <mra@tinyerp.com> | 2012-08-03 10:48:59 +0530 |
| commit | 898bc7cf03e7d4e2b06e1098816aa5ef80b139a8 (patch) | |
| tree | fbce6eca45b892f83e127114f685fe8e16984fea /addons/document_ftp | |
| parent | ecfd5b4d962ca09e1dc23de611c31d78e5d54a14 (diff) | |
| parent | 5ee6c09b3164309a05aac70501205f15787339f3 (diff) | |
[MERGE] Merge from main addons
bzr revid: mra@tinyerp.com-20120803051859-9m1s4cmrideg4u2p
Diffstat (limited to 'addons/document_ftp')
| -rwxr-xr-x | addons/document_ftp/ftpserver/ftpserver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py index bd727427541..48ec4ad5ea0 100755 --- a/addons/document_ftp/ftpserver/ftpserver.py +++ b/addons/document_ftp/ftpserver/ftpserver.py @@ -5,7 +5,7 @@ # pyftpdlib is released under the MIT license, reproduced below: # ====================================================================== # Copyright (C) 2007 Giampaolo Rodola' <g.rodola@gmail.com> -# Hacked by Fabien Pinckaers (C) 2008 <fp@tinyerp.com> +# Hacked by Fabien Pinckaers (C) 2008 <fp@openerp.com> # # All Rights Reserved # |