Merge branch 'MDL-59427-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jul 2017 17:44:07 +0000 (19:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jul 2017 17:44:07 +0000 (19:44 +0200)
commitf75b93c9d3b0e2e32081a8b541f4e6270d76613d
tree8b9c267bcafe256d8fb1e8f7808e5c8df20caa9f
parent542933e30a3165c95b32bf53f7e0c97c58a6911c
parent4998d3a5beaff8b0f94e5484c2469b846dd0c533
Merge branch 'MDL-59427-master' of https://github.com/sammarshallou/moodle