Merge branch 'MDL-62077-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 May 2018 20:48:03 +0000 (22:48 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:31 +0000 (09:17 +0800)
commit51b3c29b92928bc6bcf528641e6465320ce27891
tree1ab58df5226bfa964524f0fb5bdb3464ab176caa
parenta83b43a1181ae81c6b39d41aa7efc6540298f3f6
parent5b399ba1075fcbedc36697463ee8bf4701c5bac0
Merge branch 'MDL-62077-master' of git://github.com/bmbrands/moodle