Merge branch 'MDL-61581-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Apr 2018 16:07:09 +0000 (18:07 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Apr 2018 16:07:09 +0000 (18:07 +0200)
commit0ca25fe2a95cff0ee6413a827dfa1a2425d6b75e
tree8fb7ad34923f8ee601b088c64f4e5b5b10b5b659
parent27fef51d488493009f21a402a501f7d5f87d1cb7
parent3d7f501293ed74fefb599451d4c98b8d1f460b15
Merge branch 'MDL-61581-master' of https://github.com/lucaboesch/moodle