diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-08-03 09:14:54 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-08-03 09:14:54 +0200 |
| commit | 8a408f2ff39059ef87e331e340a8dc125f71eea8 (patch) | |
| tree | 7bb784e5f0910bed151158034c60b78a564673cc /addons/document_ftp | |
| parent | febdd29d765a7936b8777e0e4c492ffe70c4a46f (diff) | |
| parent | 4ccc1b94574bfa1666a0d0987ebaa00252e0ed79 (diff) | |
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120803071454-ictuwjq0y3gri4f8
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 # |