projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 924e4b1 de696f1)
[MERGE] forward port of branch saas-4 up to de696f1
authorChristophe Simonis <chs@odoo.com>
Tue, 15 Jul 2014 08:39:08 +0000 (10:39 +0200)
committerChristophe Simonis <chs@odoo.com>
Tue, 15 Jul 2014 08:39:08 +0000 (10:39 +0200)
1  2 
addons/project/project_view.xml patch | diff1 | diff2 | blob | history
addons/website_forum/models/forum.py patch | diff1 | diff2 | blob | history

diff --cc addons/project/project_view.xml
Simple merge
diff --cc addons/website_forum/models/forum.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.