Merge branch 'wip-MDL-39471-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 18 Jul 2017 08:48:37 +0000 (10:48 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 18 Jul 2017 08:48:37 +0000 (10:48 +0200)
commitf14987bc2407f7856b292cb19bb57659f47c5cc7
tree3391f73a32a209ddce89f1a66b1f38575c7db1f2
parentdf57a201c9d5b40d38c8a0eafda484f65a6d6f6e
parentc802d23dc86566c129c9ec5b5cac954ac996bac4
Merge branch 'wip-MDL-39471-master' of git://github.com/abgreeve/moodle