Merge branch 'maint-0.2.9' into maint-0.3.4

Browse Source

"ours" merge, to avoid taking any changes from PR 792 in 0.3.4.
(We already merged PR 791 for 29665 into 0.3.4.)

...

This commit is contained in:

teor 2019-04-19 11:59:18 +10:00

parent 116970dda7 2460b4461f

commit cbce8dedd3

No known key found for this signature in database

GPG Key ID: 10FEAA0E7075672A

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

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

Diff Content Not Available