Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara...
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 08:46:56 +0000 (16:46 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 08:46:56 +0000 (16:46 +0800)
Conflicts:
lib/db/upgrade.php
version.php


No differences found