merge 3.4

2015-05-27 18:32:41 -05:00 · 2015-05-27 18:32:41 -05:00 · d663cc4848
parent 6f05a20507 68fe9aa58c
commit d663cc4848
1 changed files with 2 additions and 1 deletions
--- 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',