diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-08-06 11:41:13 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-08-06 11:41:13 +0530 |
| commit | 2bbdc47dc8d791cd502c8fc37ec9a5273ee10292 (patch) | |
| tree | bc8dbba2cad6cc3eb2d9b343b1552d53698b6987 /addons/document_ftp/ftpserver | |
| parent | d72386f18fff4abc3e7dcd2b9223a25028375a19 (diff) | |
| parent | 0d2d7ee5855ecbd463ccc6fd902f3af54c504410 (diff) | |
[MERGE] merge with main addons
bzr revid: psi@tinyerp.com-20120806061113-1ck1nrda2sdq06im
Diffstat (limited to 'addons/document_ftp/ftpserver')
| -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 # |