Conflicts: .travis.yml __unported__/users_ldap_mail/__openerp__.py dbfilter_from_header/__init__.py disable_openerp_online/data/ir_ui_menu.xml mass_editing/__init__.py mass_editing/models/mass_object.py mass_editing/wizard/__init__.py |
||
---|---|---|
.. | ||
__init__.py | ||
fetchmail_server.py | ||
fetchmail_server_folder.py |