Merge branch 'MDL-61836-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 03:19:07 +0000 (11:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Apr 2018 03:19:07 +0000 (11:19 +0800)
commit305f4f69ebb3f84ab7f7aa7ab3024575a3151834
tree5d8dd0bd879d461617288a7dd32306defed54535
parentf13e5f7377498b860bb922bf49612ef2d0d2b408
parentce1ec9b4d96f0a6930bcd88c0e6701a88181bdaa
Merge branch 'MDL-61836-master' of git://github.com/FMCorz/moodle