Merge pull request #162 from junpataleta/master

Prepare Moodle for 3.5 development
FMCorz · Nov 13, 2017 · 801d84c · 801d84c
2 parents 35d4030 + d8ce80b
commit 801d84c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 config.json
 *.pyc
+.idea
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+v1.6.4
+------
+
+- Update config for Moodle 3.4 - Jun Pataleta
+- Add .idea to .gitignore - Jun Pataleta
+
+
 v1.6.3
 ------
 

diff --git a/mdk/config-dist.json b/mdk/config-dist.json
@@ -117,6 +117,10 @@
                 "branch" : "Pull 3.3 Branch",
                 "diffurl" : "Pull 3.3 Diff URL"
             },
+            "34" : {
+                "branch" : "Pull 3.4 Branch",
+                "diffurl" : "Pull 3.4 Diff URL"
+            },
             "master" : {
                 "branch" : "Pull Master Branch",
                 "diffurl" : "Pull Master Diff URL"
@@ -236,7 +240,7 @@
     "useCacheAsUpstreamRemote": true,
 
     // You should not edit this, this is the branch that is considered as master by developers.
-    "masterBranch": 34,
+    "masterBranch": 35,
 
     // Aliases for MDK commands.
     // An alias starting with a ! will be executed through the command line. Those also

diff --git a/mdk/version.py b/mdk/version.py
@@ -22,4 +22,4 @@
 http://github.com/FMCorz/mdk
 """
 
-__version__ = "1.6.3"
+__version__ = "1.6.4"