Merge branch 'MDL-60188-master' of git://github.com/rezaies/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 27 Nov 2017 07:57:41 +0000 (15:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 27 Nov 2017 07:57:41 +0000 (15:57 +0800)
commitd3fa95abf163dac3565ae9fa6feb133198226fcc
treede098f77323953dfaf517a90aeb0ef2591ab4cf4
parent417d543aaa778a954c64ba15170bf2dc4a7930b9
parent0897d6588e925348a7654e1daa391910c7c584a5
Merge branch 'MDL-60188-master' of git://github.com/rezaies/moodle