Merge branch 'MDL-60671-master' of https://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Nov 2017 03:05:43 +0000 (11:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Nov 2017 03:05:43 +0000 (11:05 +0800)
1  2 
lib/weblib.php

diff --cc lib/weblib.php
Simple merge