Merge branch 'wip-MDL-60478-m35' of git://github.com/amygroshek/moodle
commit49cbe666a4a3cc11a6c74349a6dc425b2af11a0d
authorJun Pataleta <jun@moodle.com>
Tue, 28 Nov 2017 00:25:51 +0000 (28 13:25 +1300)
committerJun Pataleta <jun@moodle.com>
Tue, 28 Nov 2017 00:25:51 +0000 (28 13:25 +1300)
tree34959e9c0406987c155968b9217a0d0e287aa696
parent8edbd642b40770b19bf6130888bed52ad59738f6
parentecdfab51a3259699ad2c978db8487f2d62d58170
Merge branch 'wip-MDL-60478-m35' of git://github.com/amygroshek/moodle