Merge branch 'MDL-60682' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 19:37:59 +0000 (20:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 19:37:59 +0000 (20:37 +0100)
commit8c9eecdea72ac81a3ea9b50596276b69d656dc33
tree0938f02b98cb57bfdd7d7c39aab9d60e8dfaf941
parent012398a8c27099ab2251574607c81631b7283fa3
parent223419d92c3e1ec5e472cf6a7742560727cc4838
Merge branch 'MDL-60682' of git://github.com/timhunt/moodle