Merge branch 'MDL-49533-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Jul 2016 08:40:17 +0000 (09:40 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Jul 2016 08:40:17 +0000 (09:40 +0100)
commite79999045498d4ccb3538515c6efa6fb929c2d47
tree9ff18928ebf214a5803a958aa8f601bde0e59ee8
parentd0733c7d695d9af0b3373012f392546e12fd09a7
parentf1f94da49673659025e4ef852f6e16b640215e37
Merge branch 'MDL-49533-master' of git://github.com/andrewnicols/moodle
.eslintignore
lib/thirdpartylibs.xml
lib/upgrade.txt
repository/tests/generator_test.php