Merge branch 'maint-0.4.2'

Browse Source

"git merge --strategy ours", because:
* 32295 is a quick fix for 0.4.2 only
* 32404 has a better implementation for master

...

This commit is contained in:

teor

2019-11-12 10:07:46 +10:00

parent 3d1a7d7dd7 2ee04fc309

commit 3d6ec40e6a

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available