Merge branch 'MDL-60971-master' of git://github.com/mihailges/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Dec 2017 09:03:28 +0000 (10:03 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Dec 2017 16:54:54 +0000 (17:54 +0100)
commit7b546cdb837054466c018a7441aa05f000d76205
treeb2e378ec1110e2b691c1a0fb150bee731e171175
parent3410ff644fdac6c5c67de76268f9e31066e81822
parent010c17d346386c9863c51a686b87062884b27798
Merge branch 'MDL-60971-master' of git://github.com/mihailges/moodle