Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
aFarkas committed Jul 20, 2015
2 parents e5cb874 + 7307916 commit 48f27bb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
"MIT",
"GPL-2.0"
],
"require": {
"robloach/component-installer": "*"
},
"extra": {
"component": {
"scripts": [
Expand Down
2 changes: 1 addition & 1 deletion src/html5shiv.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
* returns a shived element for the given nodeName and document
* @memberOf html5
* @param {String} nodeName name of the element
* @param {Document} ownerDocument The context document.
* @param {Document|DocumentFragment} ownerDocument The context document.
* @returns {Object} The shived element.
*/
function createElement(nodeName, ownerDocument, data){
Expand Down

0 comments on commit 48f27bb

Please sign in to comment.