projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c20eee 79ce956)
[MERGE] Web assets moved from manifests to ir.ui.view bundles
authorFabien Meghazi <fme@openerp.com>
Wed, 30 Apr 2014 15:13:02 +0000 (17:13 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 30 Apr 2014 15:13:02 +0000 (17:13 +0200)
bzr revid: fme@openerp.com-20140430151302-e42monb4klz4udw5

1  2 
addons/web/controllers/main.py patch | diff1 | diff2 | blob | history

diff --cc addons/web/controllers/main.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.