Skip to content
Snippets Groups Projects
Commit 89265954 authored by Maximilian Schröger's avatar Maximilian Schröger
Browse files

Merge branch 'Vertragsmanagement' 

# Conflicts:
#	entity/Pers_entity/Pers_entity.aod
#	process/Keyword_lib/process.js
parents 0d8d9e16 4b386b2e
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 534 additions and 0 deletions
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