[MERGE] Merged after remove conflicts
[odoo/odoo.git] / addons / document_ftp /
drwxr-xr-x   ..
-rw-r--r-- 1085 __init__.py
-rw-r--r-- 1930 __openerp__.py
drwxr-xr-x - ftpserver
drwxr-xr-x - security
drwxr-xr-x - test
-rw-r--r-- 2290 test_easyftp.py
drwxr-xr-x - wizard