Merge branch 'master' into develop

dc-js · Jan 7, 2016 · 5bebcf7 · 5bebcf7
2 parents d9d21da + 96f6171
commit 5bebcf7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -188,7 +188,7 @@ module.exports = function (grunt) {
                     browsers: [
                         {
                             browserName: 'firefox',
-                            version: '42.0',
+                            version: '43.0',
                             platform: 'Linux'
                         },
                         {
@@ -200,6 +200,11 @@ module.exports = function (grunt) {
                             browserName: 'internet explorer',
                             version: '11.0',
                             platform: 'Windows 10'
+                        },
+                        {
+                            browserName: 'MicrosoftEdge',
+                            version: '20.10240',
+                            platform: 'Windows 10'
                         }
                     ],
                     testname: '<%= conf.pkg.name %>.js'

diff --git a/web/examples/complex-reduce.html b/web/examples/complex-reduce.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>dc.js - Bar Chart Example</title>
+    <title>dc.js - Complex Reductions Example</title>
     <meta charset="UTF-8">
     <link rel="stylesheet" type="text/css" href="../css/dc.css"/>
 </head>