Merge branch 'MDL-68293-master' of git://github.com/jleyva/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 6 May 2020 04:53:16 +0000 (12:53 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 6 May 2020 04:53:16 +0000 (12:53 +0800)
commit3e5c3cf8d9f7bfa6cac04e3e07e36f960e63e4a6
treee187088cfc8c9d3d7abd44fc3f9dfd12f2cc1a9a
parent6507a3368fb39e47163e019adbc765d78d91b558
parente624a2c8a1049bc4d8feb2e8c9696f0aadb8ba08
Merge branch 'MDL-68293-master' of git://github.com/jleyva/moodle
lang/en/admin.php
message/output/airnotifier/lang/en/message_airnotifier.php