projects
/
mdk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eb0047c
)
Prepare for Moodle 3.2 development. Fixes #136
author
Frederic Massart
<fred@moodle.com>
Mon, 23 May 2016 04:23:46 +0000
(12:23 +0800)
committer
Frederic Massart
<fred@moodle.com>
Mon, 23 May 2016 04:23:46 +0000
(12:23 +0800)
mdk/config-dist.json
patch
|
blob
|
history
diff --git
a/mdk/config-dist.json
b/mdk/config-dist.json
index
6976a94
..
69f8d2f
100644
(file)
--- a/
mdk/config-dist.json
+++ b/
mdk/config-dist.json
@@
-96,10
+96,6
@@
"branch" : "Pull 2.7 Branch",
"diffurl" : "Pull 2.7 Diff URL"
},
"branch" : "Pull 2.7 Branch",
"diffurl" : "Pull 2.7 Diff URL"
},
- "28" : {
- "branch" : "Pull 2.8 Branch",
- "diffurl" : "Pull 2.8 Diff URL"
- },
"29" : {
"branch" : "Pull 2.9 Branch",
"diffurl" : "Pull 2.9 Diff URL"
"29" : {
"branch" : "Pull 2.9 Branch",
"diffurl" : "Pull 2.9 Diff URL"
@@
-108,6
+104,10
@@
"branch" : "Pull 3.0 Branch",
"diffurl" : "Pull 3.0 Diff URL"
},
"branch" : "Pull 3.0 Branch",
"diffurl" : "Pull 3.0 Diff URL"
},
+ "31" : {
+ "branch" : "Pull 3.1 Branch",
+ "diffurl" : "Pull 3.1 Diff URL"
+ },
"master" : {
"branch" : "Pull Master Branch",
"diffurl" : "Pull Master Diff URL"
"master" : {
"branch" : "Pull Master Branch",
"diffurl" : "Pull Master Diff URL"
@@
-227,7
+227,7
@@
"useCacheAsUpstreamRemote": true,
// You should not edit this, this is the branch that is considered as master by developers.
"useCacheAsUpstreamRemote": true,
// You should not edit this, this is the branch that is considered as master by developers.
- "masterBranch": 3
1
,
+ "masterBranch": 3
2
,
// Aliases for MDK commands.
// An alias starting with a ! will be executed through the command line. Those also
// Aliases for MDK commands.
// An alias starting with a ! will be executed through the command line. Those also