Merge branch '3.6' into 4.0

This commit is contained in:
Daniel Hensby 2018-01-16 12:17:40 +00:00
commit 2f59965515
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

View File

@ -47,4 +47,4 @@
},
"minimum-stability": "dev",
"prefer-stable": true
}
}