Merge branch 'MDL-65397-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Apr 2019 23:42:55 +0000 (01:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Apr 2019 23:42:55 +0000 (01:42 +0200)
1  2 
lang/en/analytics.php
lang/en/moodle.php
mod/forum/lang/en/forum.php

Simple merge
Simple merge
Simple merge