Merge branch 'MDL-52966_static_cache_core_filetypes_get_types' of https://github...
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Dec 2018 07:38:09 +0000 (15:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Dec 2018 07:38:09 +0000 (15:38 +0800)

Trivial merge