Merge branch 'MDL-63422' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Nov 2018 00:22:33 +0000 (08:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Nov 2018 00:22:33 +0000 (08:22 +0800)
1  2 
blog/classes/privacy/provider.php

Simple merge