Merge branch 'MDL-61800-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 May 2018 21:27:51 +0000 (23:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 May 2018 21:27:51 +0000 (23:27 +0200)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge