Merge branch 'MDL-64486-35' of git://github.com/peterRd/moodle into MOODLE_35_STABLE
commit279ec1f98684cf68f5d03291e8212a5e63fbba40
authorSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 07:23:31 +0000 (22 08:23 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 07:23:31 +0000 (22 08:23 +0100)
tree0ebfb31fb3ed88a4930c2376548c272ce3eafa3f
parentf9d389f45b091004e411915388fea61a316d54d8
parentf8be70825726ad7aa0e7884ff745101eb0fce0c0
Merge branch 'MDL-64486-35' of git://github.com/peterRd/moodle into MOODLE_35_STABLE