Merge branch 'MDL-62325-master' of git://github.com/rezaies/moodle
commitce514b08ee8148d644eea1f859ec0004248d846f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 Jun 2018 00:05:50 +0000 (28 02:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 Jun 2018 00:05:50 +0000 (28 02:05 +0200)
treedbfabce677ce301041dca2ed613c4b4abc49cc31
parentb66476d15d7a2c24f404f6439a82b17177fe5804
parentd6e821294e0f89a73345d668cf0f5a725dfc3c54
Merge branch 'MDL-62325-master' of git://github.com/rezaies/moodle