diff options
| author | ced <> | 2007-07-19 13:47:25 +0000 |
|---|---|---|
| committer | ced <> | 2007-07-19 13:47:25 +0000 |
| commit | ee5d9a1d3cb7bfe73e389a15393eca7b21ce8078 (patch) | |
| tree | 7308d239645e922ab205cab1c63f58350d44c850 /addons/base_setup/wizard/wizard_base_setup.py | |
| parent | fa2ccef172a68b037c122855413eacc549f4d22e (diff) | |
Merge branch 'master' of ssh://ced@dev.tinyerp.com//home/ced/terp
Conflicts:
server/bin/addons/hr_timesheet_invoice/report/cost_ledger.py
bzr revid: ced-db12d44fdefc32643c92ae0f08ee28f0029f0524
Diffstat (limited to 'addons/base_setup/wizard/wizard_base_setup.py')
0 files changed, 0 insertions, 0 deletions