Merge branch 'wip-MDL-59336-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jul 2017 17:58:51 +0000 (19:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jul 2017 17:58:51 +0000 (19:58 +0200)
commit77c8eb94c349ae8c6200a3fa53f17f867244f961
tree6801742113723d427e5a368232d4b4e9426e2c70
parentf75b93c9d3b0e2e32081a8b541f4e6270d76613d
parenteca7e52901f731bae461d8dcfd7c55e27e1d3671
Merge branch 'wip-MDL-59336-master' of git://github.com/marinaglancy/moodle