Merge branch 'stable'

Browse Source

it looks like I goofed up the last merge and the changelog didn't get
merged into master.

...

This commit is contained in:

Dylan K. Taylor

2021-10-02 20:18:06 +01:00

parent 0108888450 65e468e3c2

commit f9e6fd44bc

4 changed files with 21 additions and 7 deletions

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

2

build/php

Submodule build/php updated: ad9cd1fdb4...7069f05845