Merge branch 'wip-MDL-60167-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 17:53:48 +0000 (19:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 17:53:48 +0000 (19:53 +0200)
commitc01beb0cdf3a14c82eb6c617ea94e39dd58d2579
treea9f4779de2dcf5a4316535f77dca4ce16049af6e
parent22e99d61ca690bb021b74812e625a5adac09f687
parent9d18cfd0e8f1e36caa072a71422417bfc09109c9
Merge branch 'wip-MDL-60167-master' of git://github.com/marinaglancy/moodle