Skip to content
Snippets Groups Projects
  • JORGE SASIAIN's avatar
    2a8bfe2e
    Merge branch 'develop' into 'getting_things_to_work' · 2a8bfe2e
    JORGE SASIAIN authored
    # Conflicts:
    #   geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py
    #   geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py
    #   geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py
    2a8bfe2e
    History
    Merge branch 'develop' into 'getting_things_to_work'
    JORGE SASIAIN authored
    # Conflicts:
    #   geant_service_orchestrator/workflows/trunk_config/create_trunk_config.py
    #   geant_service_orchestrator/workflows/trunk_config_common/create_trunk_config_common.py
    #   geant_service_orchestrator/workflows/trunk_config_side/create_trunk_config_side.py