Merge branch 'MDL-58332-master' of git://github.com/ryanwyllie/moodle
commit4b0518a83405bba7873dd722cf8e54d6069c8006
authorDavid Monllao <david.monllao@gmail.com>
Mon, 10 Jul 2017 12:19:31 +0000 (10 14:19 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 10 Jul 2017 12:19:31 +0000 (10 14:19 +0200)
tree4f62f339b71f3c950611032d705aded4260908e4
parentf04b6af7d7b0d0edfe7538d274c92e0bfc4d55bf
parent7f805edb3866b4ddae2d00971806a7ea4fdd78bc
Merge branch 'MDL-58332-master' of git://github.com/ryanwyllie/moodle