Merge branch 'wip-MDL-61175-MOODLE_33_STABLE' of https://github.com/kwiliarty/moodle...
commit4865f138c71fc825622d324e7203d06583837ec3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 00:25:04 +0000 (22 01:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 00:25:04 +0000 (22 01:25 +0100)
tree40cb9afb2ca85e60b4c8ff5fed566fbd1ad2a8ca
parent9db5265f18f2ceaf56fc5a1e549d98c2d321a062
parentb025f807438bc078505b573dfb201e02d533dd25
Merge branch 'wip-MDL-61175-MOODLE_33_STABLE' of https://github.com/kwiliarty/moodle into MOODLE_33_STABLE