projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 176e14d 9699f62)
[MERGE] forward port of branch saas-5 up to 9699f62
authorDenis Ledoux <dle@odoo.com>
Mon, 15 Sep 2014 13:24:49 +0000 (15:24 +0200)
committerDenis Ledoux <dle@odoo.com>
Mon, 15 Sep 2014 13:24:49 +0000 (15:24 +0200)
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.