diff options
| author | P. Christeas <p_christ@hol.gr> | 2010-12-23 17:54:44 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2010-12-23 17:54:44 +0200 |
| commit | 98ab6360ed44bf6435405fa1808fc34682038928 (patch) | |
| tree | 0dda857046d39b19a7dc19ed39e5d3f88d9e1db3 /addons/document/document_data.xml | |
| parent | 43387c7f430a5109a5f2fcef9dd9c94594c788ff (diff) | |
| parent | 369d1d110b3e5715a3cc74e602539410785d6b7f (diff) | |
Merge branch11 into patch18
Branch patch11 had somewhere been lost in bzr hell.
Conflicts:
account/account_move_line.py
document_webdav/nodes.py
document_webdav/webdav_server.py
event_project/__init__.py
users_ldap/users_ldap.py
bzr revid: p_christ@hol.gr-20101223155444-ym8r0g4208gm88j9
Diffstat (limited to 'addons/document/document_data.xml')
0 files changed, 0 insertions, 0 deletions