Merge branch 'master' into wip_leon_T7975_caption_check_on_pasted_images
[Pman.Core] / templates / favicon.html
2018-06-29 Alan Knowlestemplates/favicon.html
2018-06-29 Alan Knowlestemplates/favicon.html