Merge branch 'MDL-57395-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 11:46:44 +0000 (11:46 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Jan 2017 11:46:44 +0000 (11:46 +0000)
1  2 
course/externallib.php
course/tests/externallib_test.php
version.php

Simple merge
Simple merge
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2016122800.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2016122200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2017010200.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.