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)
commit07b0214588ddd0753aeea7c7bda365335196d42f
tree753e2ebab2183c317c532333eb85b1119a0cec8e
parentbbe834a152bd00b2a0657e276e20f2ee85b5371c
parentfd43a49b725c81f1dede810b7ccb0d7f9c17d821
Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle

Conflicts:
lib/db/upgrade.php
version.php
lib/db/upgrade.php
lib/filelib.php
version.php