Merge branch 'MDL-60025-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 21:50:36 +0000 (23:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 21:50:36 +0000 (23:50 +0200)
commitf20f9448f7fb76689284d3cb7b04c964d8075436
tree4f2d6305913d4d2db56a0bbb86651f2bd3d7f0ef
parent6e49ef0d94aa5151ac88d8ab51b37eab4a70fb9c
parentb1ed7279e0b8a7d45a7f9494600572fa1105a015
Merge branch 'MDL-60025-master' of git://github.com/jleyva/moodle