Merge branch 'MDL-32151-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 27 Jun 2017 15:46:26 +0000 (17:46 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:45 +0000 (18:24 +0200)
commit34b3c1da70d4645fc831840bca44de257ad8d589
tree6b79333329906f9e179740ce81343c330581bb59
parent0f9bdd637ae64b46d034363f4bca04c32ffa4156
parent628fbd48fe5c8b6340ad6bfd1d52d1e941417244
Merge branch 'MDL-32151-master' of git://github.com/junpataleta/moodle