Merge pull request #263 from odoo-dev/master-fix-asset-fme
authorFabien Meghazi <agr@amigrave.com>
Wed, 28 May 2014 22:27:54 +0000 (00:27 +0200)
committerFabien Meghazi <agr@amigrave.com>
Wed, 28 May 2014 22:27:54 +0000 (00:27 +0200)
commit7dd10060df8ef3ec64c0ca264f1d096e027c1846
treee0c7ac0244df627b1f213d96785641cb2f21f64c
parentd42840a6f8f583ffa22f44aa993ed6fe217e5694
parentc9e12161c90783410f9a3307c7706b144654bdd5
Merge pull request #263 from odoo-dev/master-fix-asset-fme

[FIX] website_mail.editor.js moved but still referenced

Commit 0c89ca0 moves
website_mail.editor.js but is still referenced in website_mail.xml