Merge branch 'MDL-68871-master' of git://github.com/ferranrecio/moodle
authorSara Arjona <sara@moodle.com>
Wed, 3 Jun 2020 16:48:01 +0000 (18:48 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 3 Jun 2020 16:48:01 +0000 (18:48 +0200)
commit688ba22d6b34f1688be17a0749d3f112d11c843b
tree294badbc7a44a102507e8a8c5076b9445ffdbb13
parent0e6d73245b224dbdb98791f16ac54fc469f4f21d
parent3af22ad9629ade450e9d93979775c08f20d2c672
Merge branch 'MDL-68871-master' of git://github.com/ferranrecio/moodle