Merge branch 'MDL-58781_master' of https://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 21:39:35 +0000 (23:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 21:39:35 +0000 (23:39 +0200)
commitd20250ab3ec7521763a611d6848afc486721daac
treecf8821b3e21ee7800ae3fca16769850b48711308
parent4ab33be074a3101844b8755e0a3c25ab1e35328b
parentb0af7093cf504b0457a2798ac2adfe92d60256d7
Merge branch 'MDL-58781_master' of https://github.com/aanabit/moodle