Merge branch 'MDL-63442-master' of git://github.com/abias/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 4 Oct 2018 03:02:34 +0000 (11:02 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 4 Oct 2018 03:02:34 +0000 (11:02 +0800)
1  2 
lang/en/moodle.php
lib/outputrenderers.php

Simple merge
Simple merge