Skip to content
Snippets Groups Projects
  • Maximilian Schröger's avatar
    d2b4e4ad
    Merge branch 'Produktmanagement' · d2b4e4ad
    Maximilian Schröger authored
    # Conflicts:
    #	aliasDefinition/Data_alias/Data_alias.aod
    #	application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
    #	entity/Org_entity/Org_entity.aod
    #	others/db_changes/masterChangelog.xml
    #	process/Keyword_lib/process.js
    d2b4e4ad
    History
    Merge branch 'Produktmanagement'
    Maximilian Schröger authored
    # Conflicts:
    #	aliasDefinition/Data_alias/Data_alias.aod
    #	application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
    #	entity/Org_entity/Org_entity.aod
    #	others/db_changes/masterChangelog.xml
    #	process/Keyword_lib/process.js