Merge branch 'MDL-30295' of git://github.com/scriby/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 20 Nov 2011 23:58:12 +0000 (00:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 20 Nov 2011 23:58:12 +0000 (00:58 +0100)
Conflicts:
mod/lti/lang/en/lti.php

1  2 
mod/lti/lang/en/lti.php

@@@ -488,4 -489,4 +489,4 @@@ $string['types'] = 'Types'
  $string['update'] = 'Update';
  $string['using_tool_configuration'] = 'Using tool configuration: ';
  $string['validurl'] = 'A valid URL must start with http(s)://';
--$string['viewsubmissions'] = 'View submissions and grading screen';
++$string['viewsubmissions'] = 'View submissions and grading screen';