Merge branch 'MDL-57658-master-3' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Mar 2017 16:06:19 +0000 (16:06 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Mar 2017 16:06:19 +0000 (16:06 +0000)
commitbcd510e36dbc2fe8babe55087337dd0934c3c847
treeeab2e2d1e33d6cf2032aebaf9ece97fe3c917995
parent1f7734931f1e88c69bb8f57f3c59199bb254f862
parent8ddc656739d3f29464fea448afdd313a9321c7b3
Merge branch 'MDL-57658-master-3' of git://github.com/junpataleta/moodle
lang/en/calendar.php