Merge pull request #31 from Polymer/master

8/8 master -> stable
googlearchive · Aug 8, 2013 · 90d76ed · 90d76ed
2 parents 92b34ea + 3ee4c4b
commit 90d76ed
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@
 platform.min*
 platform.native*
 platform.sandbox*
+build.bat
diff --git a/gruntfile.js b/gruntfile.js
@@ -168,6 +168,7 @@ module.exports = function(grunt) {
       }
     }
   })();
+
   grunt.initConfig({
     karma: {
       options: {

diff --git a/src/patches-shadowdom-polyfill.js b/src/patches-shadowdom-polyfill.js
@@ -54,5 +54,5 @@
 
   //TODO(sjmiles): review method alias with Arv
   HTMLElement.prototype.webkitCreateShadowRoot =
-      HTMLElement.prototype.createShadowRoot;
+      HTMLElement.prototype.createShadowRoot;    
 })();
diff --git a/tools b/tools
-Original file line number
+Diff line change
@@ Expand Up / @@ -168,6 +168,7 @@ module.exports = function(grunt) { @@
           }
         }
       })();
       grunt.initConfig({
         karma: {
           options: {
@@ Expand Down @@