Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle
commit214eef2e1aef63eea02a4191bf3a3e38ae485274
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Jan 2017 00:47:54 +0000 (24 08:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Jan 2017 00:47:54 +0000 (24 08:47 +0800)
treef17fcdaec042b2da12be809e33d9d81079492b57
parentcffa0ec79b3757854325ec0454c6f1100d11448a
parent225965bd4fd6496f4f34546f97d3229666cd148d
Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle
mod/scorm/tests/behat/completion_condition_require_status.feature