Merge branch 'MDL-65101_36' of git://github.com/markn86/moodle into MOODLE_36_STABLE
commit821c578ff30a88f61cb756d37ec3523e07c5483b
authorSara Arjona <sara@moodle.com>
Tue, 2 Jul 2019 12:50:34 +0000 (2 14:50 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 2 Jul 2019 12:50:34 +0000 (2 14:50 +0200)
treedf47f18a9f1f1a79aa446e261858f882b529374c
parent6b4a4fba824a43ed25748d5949895a8c5014a4db
parent885b98991b7941cb5e1ac3e2d9864fbc35390d8a
Merge branch 'MDL-65101_36' of git://github.com/markn86/moodle into MOODLE_36_STABLE