Merge remote-tracking branch 'origin/4.0' into 4

Browse Source

# Conflicts:
#	tests/php/Controllers/CMSMainTest.php

...

This commit is contained in:

Damian Mooyman 2017-12-19 10:33:38 +13:00

parent 3efcd09f0a c4b2782ce0

commit 4d9a5ce943

No known key found for this signature in database

GPG Key ID: 78B823A10DE27D1A

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