Merge branch 'MDL-57991-master' of https://github.com/micaherne/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 18 Jul 2017 07:40:59 +0000 (09:40 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 18 Jul 2017 07:40:59 +0000 (09:40 +0200)
commitd0f28cf0586aa2d41eb2fbfa8c3462eae6f6d925
tree2ecba1d543e54cad59fdcdd798a56a7329a42416
parentc9f2924941dfe7ee4d9d7faeead1cbe4de690427
parent8b6dcb0479c356ae0587e5bca8674daad9419a95
Merge branch 'MDL-57991-master' of https://github.com/micaherne/moodle