Merge branch 'MDL-62852-master' of git://github.com/sarjona/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 25 Jul 2018 08:38:47 +0000 (16:38 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 25 Jul 2018 08:38:47 +0000 (16:38 +0800)
commit6830ae12c7d6101edc62987fcabe825252ab7bfc
treeb68f02d77638cf6ec5396fb790211c36b32ee4df
parenta77beeb245593cd61581e3376f84a2cbf6bfe139
parent7b3a1137769de0afc697dda59b8eec697711fbb2
Merge branch 'MDL-62852-master' of git://github.com/sarjona/moodle