Skip to content
Snippets Groups Projects
Commit a4f7f8ea authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge origin/master into object-relation 

Conflicts:
	entity/Contract_entity/Contract_entity.aod
parents 61b67803 c91cbf56
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 231 additions and 219 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