Merge branch 'MDL-59142-master' of git://github.com/lameze/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 14 Jun 2017 03:29:35 +0000 (11:29 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:38:11 +0000 (12:38 +0100)
commitbb931788cc6f629e834653ef5bbd8b1a7021ff6e
treeb52350e734031be88cc7cb3321d0121cafa70299
parent7419853951ef03467144eefb3a76186c78208a7c
parent4cc2f33b08f3294e7aa59c2de2ee6bc48ced2a91
Merge branch 'MDL-59142-master' of git://github.com/lameze/moodle
lang/en/cache.php
lib/db/caches.php
theme/styles.php
version.php