Merge branch 'MDL-59362_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jun 2017 15:21:54 +0000 (17:21 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:44 +0000 (18:24 +0200)
commit0f9bdd637ae64b46d034363f4bca04c32ffa4156
treefb6bc4f8dd83ce3723daa7c6186f4070e3acd387
parent56fc5143ad30a0253427353a6a1f5a16db0db4f4
parent6d721cab9e50806b55fa71f70e18f00243daa5a3
Merge branch 'MDL-59362_master' of git://github.com/markn86/moodle