L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-70229_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2020-11-14 19:50:45 +01:00
parent f86b5e3545 adb8fe4c42
commit 5ba86bc8f5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -213,7 +213,7 @@ before_script:
# We need the official upstream for comparison
git remote add upstream https://github.com/moodle/moodle.git;
git fetch upstream MOODLE_310_STABLE;
git fetch upstream MOODLE_311_STABLE;
export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
export GIT_COMMIT="$TRAVIS_COMMIT";
export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`
backup/backup.class.php
+1 -1
View File
@@ -160,7 +160,7 @@ abstract class backup implements checksumable {
/**
* Usually same than major release zero version, mainly for informative/historic purposes.
*/
const RELEASE = '3.10';
const RELEASE = '3.11';
/**
* Cipher to be used in backup and restore operations.
version.php
+4 -4
View File
@@ -29,9 +29,9 @@
defined('MOODLE_INTERNAL') || die();
$version = 2020110900.01; // 20201109 = branching date YYYYMMDD - do not modify!
$version = 2020111400.01; // 20201109 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '3.10+ (Build: 20201113)';// Human-friendly version name
$branch = '310'; // This version's branch.
$maturity = MATURITY_STABLE; // This version's maturity level.
$release = '3.11dev (Build: 20201113)';// Human-friendly version name
$branch = '311'; // This version's branch.
$maturity = MATURITY_ALPHA; // This version's maturity level.