Merge branch 'MDL-62408_master' of https://github.com/marxjohnson/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 27 May 2018 23:40:07 +0000 (01:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 27 May 2018 23:40:07 +0000 (01:40 +0200)
commit4a0c77037290ccf49f396ae6d60127cd207857b6
tree21f2e17d99f7dad0d0ef814c00f88baefdc3b139
parent6b2e04676a6ccfe46e793aaddcb944469533eca7
parent104fc7fd0dbf9020273d3990b62c84dd0aefedfa
Merge branch 'MDL-62408_master' of https://github.com/marxjohnson/moodle