Merge branch 'MDL-62211-master' of git://github.com/junpataleta/moodle
commitaf0202c5c2ac6ab3278c53468762276bd18df594
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 15:29:38 +0000 (3 17:29 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 21:33:02 +0000 (3 23:33 +0200)
treeeeed7655bc77db4cbe347b7d186fb3baa0fe9dd5
parent6d57e231972e55f0c92a11a4f6fb4ca0b337b212
parent4c72ffa5ef823bdd9125c2036923dd7fa3aceb1c
Merge branch 'MDL-62211-master' of git://github.com/junpataleta/moodle
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php