Merge branch 'MDL-63614_35' of https://github.com/stronk7/moodle into MOODLE_35_STABLE
commit395b1f8fe7faf30bc13002005ec0796676971773
authorJun Pataleta <jun@moodle.com>
Fri, 8 Feb 2019 00:38:00 +0000 (8 08:38 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 8 Feb 2019 00:38:00 +0000 (8 08:38 +0800)
tree49c1e82dff1bf9a3c99280555c36cc7a53db74ff
parent2a26069c13d7b00435395fc2494e42f5448a633f
parent1a20233e7ffeaed939d5d68ccf863cea7acf0325
Merge branch 'MDL-63614_35' of https://github.com/stronk7/moodle into MOODLE_35_STABLE