Merge branch 'wip-MDL-58854-master' of git://github.com/marinaglancy/moodle
commit675ffb4d059a135828f89fbf7f6957fd6d937d8f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 May 2017 00:09:02 +0000 (10 02:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 May 2017 00:09:02 +0000 (10 02:09 +0200)
tree5a26f271a705be3db68674252b8074e7e09db117
parentb16603770ba6d6b58a112229a5b44f1ef3dc5da5
parent947f5c3448a3bd8356b6322ef72fa9cd5fd3bdd1
Merge branch 'wip-MDL-58854-master' of git://github.com/marinaglancy/moodle