Commit abeab73b authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '2.1.x' into 2.2.x

Closes gh-22170
parents 64aa418b bca5ef4a
...@@ -90,7 +90,6 @@ resources: ...@@ -90,7 +90,6 @@ resources:
git_config: git_config:
- name: core.autocrlf - name: core.autocrlf
value: true value: true
icon: github-circle
- name: git-pull-request - name: git-pull-request
type: pull-request type: pull-request
icon: source-pull icon: source-pull
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment