Merge branch 'MDL-60048-master' of https://github.com/Kathrin84/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 19 Sep 2017 09:21:40 +0000 (17:21 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 19 Sep 2017 09:21:40 +0000 (17:21 +0800)
commit66502b81805b8ff8e46013b4d8c108355d119f53
treedca3464991d72d34fc47caa829f9a507a61217cd
parent708100cbefdfe9d2722bf2f99118b372a1c6d603
parent88d7f109a0975ac85107c501f904cd2738db8334
Merge branch 'MDL-60048-master' of https://github.com/Kathrin84/moodle