Merge branch 'MDL-59067_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Aug 2017 00:55:20 +0000 (02:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Aug 2017 00:55:20 +0000 (02:55 +0200)
commita7417383fac905dc0465cd9e64dc83f5af33033b
tree67af8ae16a6f51e0f13ffdf08de028e4750ea0a1
parent018b1f3112b0d5d010de5c06b4e2abe248eb98de
parent0690a271c375af646d3cb3697579561abc80bee9
Merge branch 'MDL-59067_master' of git://github.com/dmonllao/moodle
analytics/classes/local/time_splitting/base.php
lib/db/upgrade.php
version.php