Merge branch 'MDL-62315-master-privacycoreform' of git://github.com/mudrd8mz/moodle
commit6c0b4929c696abaf5a0064cd8128e3ea5ff7cb79
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 May 2018 21:40:37 +0000 (3 23:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 May 2018 21:40:37 +0000 (3 23:40 +0200)
tree35f9c6e8bbfe24c18339da97e2e56ae692cdd863
parent3149bea2c4f0bdd9e254ecdf5f321d4324a70baa
parentfa7297aff04f4a340708c3a5e9c9a0c80698df05
Merge branch 'MDL-62315-master-privacycoreform' of git://github.com/mudrd8mz/moodle