Merge branch 'master' into feature/context-menu

This commit is contained in:
Aaron Riedel 2022-03-06 11:21:38 +01:00
commit 839be1ebae
Signed by: aaron
GPG key ID: 643004654D40D577

View file

@ -29,4 +29,5 @@ docker-build:
- if: $CI_COMMIT_BRANCH
exists:
- Dockerfile
- if: $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "dev"
- if: $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "dev"
when: always