Merge pull request #13527 from mehrdada/upmerge-v18x

Browse Source

Upmerge v1.8.x to master after version bump

Prevents merge conflicts on upmerges from the branch

pull/13539/head

Mehrdad Afshari 7 years ago committed by GitHub

parent 2a56d2e443 3c156b9a8d

commit 0e142d4742

No known key found for this signature in database

GPG Key ID: 4AEE18F83AFDEB23

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available