Merge branch '2.1.x' into 2.2.x

Closes gh-22170

Merge branch '2.1.x' into 2.2.x
Closes gh-22170
abeab73b · Andy Wilkinson · 64aa418b · bca5ef4a · abeab73b
Commit abeab73b authored Jun 30, 2020 by Andy Wilkinson
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

pipeline.yml ci/pipeline.yml +0 -1

No files found.
--- 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