Merge branch 'MDL-53113-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Jan 2018 09:37:23 +0000 (10:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Jan 2018 09:37:23 +0000 (10:37 +0100)
1  2 
lib/upgrade.txt

diff --cc lib/upgrade.txt
Simple merge