Merge branch 'MDL-57945-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 24 Jul 2017 11:24:31 +0000 (13:24 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 24 Jul 2017 11:24:31 +0000 (13:24 +0200)
commit87d1c6134fbb5b3ead8813b199857ed51c6e07ca
tree3e88b96ff87b6d5e12dd0f15a63b888f0ea5242d
parent4364fdb53755f8ebb9247e92ff36e9e61e261a09
parenteb5d54a09ad916ca50f5829f76cff1a08bd97f07
Merge branch 'MDL-57945-master' of git://github.com/danpoltawski/moodle