Merge branch 'MDL-59900_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 08:03:46 +0000 (16:03 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 08:03:46 +0000 (16:03 +0800)
1  2 
lang/en/analytics.php

Simple merge