Merge branch 'MDL-59448-master' of https://github.com/xow/moodle
commit9eebb3c38b1e39b624d83ebcf5084747bfb0a9aa
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Aug 2017 02:25:06 +0000 (8 04:25 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Aug 2017 02:25:06 +0000 (8 04:25 +0200)
tree595974e6c87b6215a68461544ab4bef2a4a81aa8
parente8e53efba83a9a01a46f45e27d5f73f405c709fd
parent8b0e965d308a857f22f146ed8243f9d06ef7f7c5
Merge branch 'MDL-59448-master' of https://github.com/xow/moodle