Commit 678a28b0 authored by Arie Peterson's avatar Arie Peterson
Browse files

Merge branch 'v0.8' into 'pre-release/v0.8'

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
parents 999b9cb4 9250dae9