Commit 102ba265 authored by Frank Bergmann's avatar Frank Bergmann

Merge branch 'master' of https://gitlab.project-open.net/project-open/intranet-timesheet2-invoices

Conflicts:
	tcl/intranet-timesheet2-invoices-procs.tcl
parents 0040abaf 1c3aa179
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment