Merge branch 'MDL-61449-master' of git://github.com/jleyva/moodle
commit445f3e3f4f880b48d42e950548cb773d1d774a56
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 22:43:31 +0000 (10 00:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 22:43:31 +0000 (10 00:43 +0200)
treee0973c2a15730cbe0abbcda26adbc735b4b456cb
parent90ce448189f99c34fc5a1a60ef0f9b1b94a59c08
parentb9e6db9ddcd65c695d94e6df0dcbf467b49f676d
Merge branch 'MDL-61449-master' of git://github.com/jleyva/moodle