Skip to content
  • Arie Peterson's avatar
    Merge branch 'v0.8' into 'pre-release/v0.8' · 678a28b0
    Arie Peterson authored
    Solve merge conflicts (probably due to cherry-picking) by choosing the pre-release version.
    # Conflicts:
    #   .gitlab/ci_pipelines/default.yml
    #   .gitlab/ci_pipelines/install_stackspin.yml
    #   .gitlab/ci_pipelines/upgrade_test.yml
    #   Dockerfile
    #   flux2/apps/zulip/zulip-values-configmap.yaml
    #   install/install-stackspin.sh
    678a28b0