Merge branch 'MDL-44612-master' of git://github.com/junpataleta/moodle
commit74c0b5fe91d8cd4b0357f8124d50377047980be9
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Jan 2018 00:11:06 +0000 (30 01:11 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:17 +0000 (1 10:33 +0800)
treed0b7b7eda0e1d988711f36ae2fbea78231d998b1
parentaa783806304401ef3a7e32ba407b16cd13b1d7dd
parentab9ee20ec776e3fb028f835973c3f80f3d5883ae
Merge branch 'MDL-44612-master' of git://github.com/junpataleta/moodle