Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle
commit6b7194a7cf052e5c6423f8848784caed7cee0cf0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Oct 2017 20:30:08 +0000 (19 22:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Oct 2017 20:30:08 +0000 (19 22:30 +0200)
tree103cd20b132a8bbc8e5ef43767276ad8072e59d0
parentecb4a05cc2a23789356a608395855a486ddad7d8
parentf10721d6b94c49171c942ffddc8aa185db6f44eb
Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle
lib/db/upgrade.php
mod/assign/locallib.php
mod/data/lang/en/data.php
mod/feedback/lang/en/feedback.php
version.php