Merge branch '4.4' into 4

This commit is contained in:
Aaron Carlino 2019-06-11 11:48:18 +12:00
commit 731646f49d

View File

@ -240,6 +240,7 @@ conditions.
Yes, it will attempt to find the most recent public "hash-less" URL Yes, it will attempt to find the most recent public "hash-less" URL
for this file and redirect to it. for this file and redirect to it.
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
### Changing the file resolver ### Changing the file resolver