Merge branch 'MDL-60904' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Sun, 26 Nov 2017 22:27:57 +0000 (11:27 +1300)
committerJun Pataleta <jun@moodle.com>
Sun, 26 Nov 2017 22:27:57 +0000 (11:27 +1300)
commit84ae267c56f17d706fdfc850b232c5a43f8a3262
tree31ac881094b20d134aeaec53ec0f8620930bdddd
parent5bde2c2b62a71a6d4f89ac90755db1cced2e6baa
parent2fdd9eed5479b851bc99fc3c88e0fdc5fe6a0cca
Merge branch 'MDL-60904' of git://github.com/stronk7/moodle