Merge branch 'MDL-61110_master' of https://github.com/nadavkav/moodle
commit147b4f3dee42704d3e913ce6dd921fa1fd47ef2e
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Jul 2018 07:59:06 +0000 (10 09:59 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Jul 2018 07:59:06 +0000 (10 09:59 +0200)
treeff6a657cf5c7490254b16d58b4875335d216f8b7
parentdebbed03edc13e339973992243fa51a1bdb249a4
parent3cac3a85908c620440e0123336f3634282f6a050
Merge branch 'MDL-61110_master' of https://github.com/nadavkav/moodle