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

Merge origin/master into #1035025_SALUTATION 

Conflicts:
	entity/Person_entity/Person_entity.aod
	entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
	others/db_changes/masterChangelog.xml
parents 1569043f e5f863eb
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
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