Merge branch 'MDL-63811' of git://github.com/aolley/moodle
commit7a99ff70b9d1b0f8ab689d30f0e09432b2074d77
authorJun Pataleta <jun@moodle.com>
Thu, 15 Nov 2018 09:09:28 +0000 (15 17:09 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 15 Nov 2018 09:09:28 +0000 (15 17:09 +0800)
tree1be9c9df3a432604854c8f67a0639f55d579c9a3
parentf4ccea6f528dba76afc37c6ab517ad6e8fba8b30
parentedd51eb2455ceea73cc938d01239b2bdb1b8398c
Merge branch 'MDL-63811' of git://github.com/aolley/moodle