Merge branch 'MDL-61937-master-fix' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 7 May 2018 01:38:10 +0000 (09:38 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 7 May 2018 01:38:10 +0000 (09:38 +0800)
1  2 
mod/data/classes/privacy/provider.php

Simple merge