Merge branch 'MDL-57490-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 04:09:20 +0000 (12:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 04:09:20 +0000 (12:09 +0800)
commit40566af6d5b70d033ecaf2ab0c477d0277132fe1
tree5064091564ca5a7411b52139e777b50828a9408a
parent3dc330593694eb117b14ff499c19f5049acc1150
parentf8abbbe29e2329446661e26a2e9cd2f66c133f5c
Merge branch 'MDL-57490-master' of git://github.com/danpoltawski/moodle
lib/javascript-static.js
lib/upgrade.txt
mod/lesson/report.php