Merge origin/master into #1035025_SALUTATION (796f31ac) · Commits · xrm / basic · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

basic
- Activity
- Members
- Releases
- Model registry
- Contributor analytics
- Model experiments

Snippets Groups Projects

796f31ac

Commit 796f31ac authored 6 years ago by Johannes Hörmann

Downloads
- Patches
- Plain Diff

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

parent 2cf3de73

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

others/db_changes/data_alias/basic/2019.2/changelog.xml 1 addition, 1 deletion

others/db_changes/data_alias/basic/2019.2/changelog.xml
others/db_changes/data_alias/basic/2019.2/create_salutation.xml 332 additions, 0 deletions

.../db_changes/data_alias/basic/2019.2/create_salutation.xml
others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml 0 additions, 13 deletions

others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
others/db_changes/data_alias/struct/create_salutation.xml 0 additions, 17 deletions

others/db_changes/data_alias/struct/create_salutation.xml

with 333 additions and 31 deletions

Loading

Johannes Hörmann @j.hoermann
mentioned in commit 9ce702a0
· 6 years ago

mentioned in commit 9ce702a0

mentioned in commit 9ce702a06eb033242efc528bfc27823144542d47

Toggle commit list

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment