Merge branch 'MDL-65539' of https://github.com/NeillM/moodle
authorSara Arjona <sara@moodle.com>
Mon, 6 Apr 2020 14:40:52 +0000 (16:40 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 6 Apr 2020 14:40:52 +0000 (16:40 +0200)
1  2 
course/format/topics/format.js
course/format/weeks/format.js

Simple merge
Simple merge