Merge branch 'wip-MDL-57187-master' of https://github.com/marinaglancy/moodle
commiteacacae8cc81ad6799322610e2eede3b09d4683b
authorDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 11:46:19 +0000 (19 12:46 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 11:46:19 +0000 (19 12:46 +0100)
tree4f262e341552cbc7754126cad6bfe65c2f2bfa40
parentdc87f411dd957c0a6573d5ce73f8ef783867a61f
parent59e004cd79f58acc49910f2940a0177dc1f5092a
Merge branch 'wip-MDL-57187-master' of https://github.com/marinaglancy/moodle