Merge branch 'master' into v4

Browse Source

Crazy merge to make v4 into the master branch.

Done with git merge -s ours

https://stackoverflow.com/a/56945250

...

This commit is contained in:

Jack Christensen

2019-09-14 20:37:33 -05:00

parent 2799739ef3 c73e7d7506

commit 251c1cb106

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