projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 88236bf ee9191c)
[MERGE] : with trunk and resolve conflicts
authorajay javiya (OpenERP) <aja@tinyerp.com>
Tue, 1 Apr 2014 05:28:01 +0000 (10:58 +0530)
committerajay javiya (OpenERP) <aja@tinyerp.com>
Tue, 1 Apr 2014 05:28:01 +0000 (10:58 +0530)
commit138f5d7f32e9480539bed126cfaf55748797c82a
tree6cdfbddb931cef024a8efced5415e717769ce666tree | snapshot
parent88236bf2acb689454ae893d84737086f55439150commit | diff
parentee9191ca1b08c87c3b72698fffea0f3b753776e2commit | diff
[MERGE] : with trunk and resolve conflicts

bzr revid: aja@tinyerp.com-20140401052801-4483i0z0ivmrwsbn
addons/website_blog/controllers/main.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.