Skip to content
Snippets Groups Projects
Commit 837f7c18 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch 'KeywordMigration'

# Conflicts:
#	entity/Activity_entity/Activity_entity.aod
#	entity/Productprice_entity/recordcontainers/db/recordfieldmappings/pricelist.displayvalue/expression.js
#	entity/Salesproject_entity/Salesproject_entity.aod
#	entity/Task_entity/Task_entity.aod
#	others/db_changes/data_alias/basic/2019.2/changelog.xml
parents d2127856 6ee1c53a
No related branches found
No related tags found
No related merge requests found
Showing
with 127 additions and 65 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment