Merge branch 'MDL-61198-master' of git://github.com/jleyva/moodle
commita5db58f4f215a2fddcd87b616e06d37ed9ff0567
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Apr 2018 16:23:59 +0000 (11 18:23 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Apr 2018 16:23:59 +0000 (11 18:23 +0200)
tree83b42f0751b34682235d180760f13c60f8427c7b
parent0ca25fe2a95cff0ee6413a827dfa1a2425d6b75e
parentcf58a2d528a3490c770ba4fb12f1c874c852ed3f
Merge branch 'MDL-61198-master' of git://github.com/jleyva/moodle