Merge branch 'MDL-59049-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 21:09:09 +0000 (23:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 21:09:09 +0000 (23:09 +0200)
commit6b1e790231260ccd0b6c9df48f0f3b45b1e139d2
treee71a6900514f463bea4732afa1df46184db7f758
parent8711ab92a90ba828b8f9b6221831e214152a949c
parentc09541fd280cc46bde7475adb8a135e070200bbb
Merge branch 'MDL-59049-master' of https://github.com/snake/moodle