projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4f52f1 45727ab)
Merged trunk-website-al
authorddm <ddm@openerp.com>
Tue, 10 Sep 2013 10:33:53 +0000 (12:33 +0200)
committerddm <ddm@openerp.com>
Tue, 10 Sep 2013 10:33:53 +0000 (12:33 +0200)
bzr revid: ddm@openerp.com-20130910103353-j5sbly1v6m93qiel

1  2 
addons/website/static/src/css/editor.css patch | diff1 | diff2 | blob | history
addons/website/static/src/css/editor.sass patch | diff1 | diff2 | blob | history
addons/website/static/src/js/website.editor.js patch | diff1 | diff2 | blob | history
addons/website/views/views.xml patch | diff1 | diff2 | blob | history

diff --cc addons/website/views/views.xml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.