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

Merge refactor_entity into object-relation 

Conflicts:
	entity/Contract_entity/Contract_entity.aod
	entity/ObjectRelation_entity/ObjectRelation_entity.aod
	entity/Pers_entity/Pers_entity.aod
	entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js
parents d0ea5d5a 42ca5338
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 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