Skip to content
Snippets Groups Projects
  • David Büchler's avatar
    7d5c46cd
    Merge branch 'master' into campaignmanagement · 7d5c46cd
    David Büchler authored
    # Conflicts:
    #	.liquibase/Data_alias/basic/2019.2/changelog.xml
    #	.liquibase/Data_alias/changelog.xml
    #	aliasDefinition/Data_alias/Data_alias.aod
    #	entity/Organisation_entity/Organisation_entity.aod
    #	entity/Person_entity/Person_entity.aod
    #	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
    #	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
    #	others/db_changes/Data_alias/changelog.xml
    #	others/db_changes/data_alias/changelog.xml
    
    Serienaktion Stufe updaten
    7d5c46cd
    History
    Merge branch 'master' into campaignmanagement
    David Büchler authored
    # Conflicts:
    #	.liquibase/Data_alias/basic/2019.2/changelog.xml
    #	.liquibase/Data_alias/changelog.xml
    #	aliasDefinition/Data_alias/Data_alias.aod
    #	entity/Organisation_entity/Organisation_entity.aod
    #	entity/Person_entity/Person_entity.aod
    #	language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
    #	language/_____LANGUAGE_en/_____LANGUAGE_en.aod
    #	others/db_changes/Data_alias/changelog.xml
    #	others/db_changes/data_alias/changelog.xml
    
    Serienaktion Stufe updaten