Merge branch 'stable' into next-minor

Browse Source

# Conflicts:
#	composer.lock

...

This commit is contained in:

Dylan K. Taylor

2020-05-31 14:43:53 +01:00

parent ecbf21acea 3f07f06874

commit 71e0521286

7 changed files with 1543 additions and 45 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

1575

composer.lock generated

File diff suppressed because it is too large Load Diff