Merge remote-tracking branch 'dev/13-4-stable' into 13-4-stable

bfbbc52f · GitLab Release Tools Bot · e7d9e8b4 · bf8ebe4d · bfbbc52f · bfbbc52f
Commit bfbbc52f authored Oct 15, 2020 by GitLab Release Tools Bot
3 changed files
--- a/changelogs/unreleased/revert-42465-and-42343.yml
+++ b/changelogs/unreleased/revert-42465-and-42343.yml
+---
+title: 'Revert 42465 and 42343: Expanded collapsed diff files'
+merge_request: 43361
+author:
+type: other
--- a/vendor/gitignore/C++.gitignore
+++ b/vendor/gitignore/C++.gitignore
--- a/vendor/gitignore/Java.gitignore
+++ b/vendor/gitignore/Java.gitignore