Merge branch 'MDL-57244-master-text' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Aug 2018 17:16:58 +0000 (19:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Aug 2018 17:16:58 +0000 (19:16 +0200)
commit5114d1168b548a1881134a9d71f6825684d869c5
treec7ab7456e43185756276687a0dc99e51e98c6859
parentaa75f70280b1094a07986c154aa3dc0815300ac1
parenteb8dfd5bf854e4bf9ccf5e34b5143f141dc68e9e
Merge branch 'MDL-57244-master-text' of git://github.com/abgreeve/moodle