Merge branch '2.1.x' into 2.2.x

Closes gh-22170
2020-06-30 16:45:46 +01:00
parent 64aa418baa bca5ef4ac8
commit abeab73b2c
1 changed files with 0 additions and 1 deletions
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -90,7 +90,6 @@ resources:
    git_config:
    - name: core.autocrlf
      value: true
-  icon: github-circle
 - name: git-pull-request
  type: pull-request
  icon: source-pull