projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c42573f 4f3c92e)
merging from the trunk-addons
authorMantavya Gajjar <mga@tinyerp.com>
Thu, 27 Nov 2008 15:13:09 +0000 (20:43 +0530)
committerMantavya Gajjar <mga@tinyerp.com>
Thu, 27 Nov 2008 15:13:09 +0000 (20:43 +0530)
bzr revid: mga@tinyerp.com-20081127151309-91yw7ta6slki0s7a

1  2 
addons/wiki/wiki.py patch | diff1 | diff2 | blob | history

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