Merge branch 'MDL-40818-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jun 2017 23:50:28 +0000 (01:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jun 2017 23:50:28 +0000 (01:50 +0200)
commit139648e5bd26917d8eb7ceba7905b9b6a1060fff
tree0120d883b35901664eb4c59859e7261932a0a0c1
parent51fc76193d924897b0022e7ae9351f56b58d03cb
parentfb1a615dfec57ae37f2353259a0c3959dba9fb84
Merge branch 'MDL-40818-master' of git://github.com/junpataleta/moodle