Merge branch 'master' of https://github.com/odoo/odoo master
[odoo/odoo.git] / doc / images /
drwxr-xr-x   ..
-rw-r--r-- 26704 inheritance_methods.png