summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-05-27 23:32:41 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-05-27 23:32:41 (GMT)
commitd663cc4848bb42a5ef7d6d887ed3304d789d4141 (patch)
tree461b403e8ec8d0da7495571434651d662e87045b
parent6f05a20507823f345083d9a7cf79be267be87134 (diff)
parent68fe9aa58c139e3a6f8c9188760bb237added7d6 (diff)
downloadcpython-d663cc4848bb42a5ef7d6d887ed3304d789d4141.zip
cpython-d663cc4848bb42a5ef7d6d887ed3304d789d4141.tar.gz
cpython-d663cc4848bb42a5ef7d6d887ed3304d789d4141.tar.bz2
merge 3.4
-rw-r--r--Doc/tools/static/version_switch.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/tools/static/version_switch.js b/Doc/tools/static/version_switch.js
index edb025b..7289a4d 100644
--- a/Doc/tools/static/version_switch.js
+++ b/Doc/tools/static/version_switch.js
@@ -2,7 +2,8 @@
'use strict';
var all_versions = {
- '3.5': 'dev (3.5)',
+ '3.6': 'dev (3.6)',
+ '3.5': '3.5',
'3.4': '3.4',
'3.3': '3.3',
'3.2': '3.2',