Merge branch 'ntwb-editorconfig' into 3.0.0-wip

This commit is contained in:
Mark Otto 2013-04-22 22:58:33 -07:00
commit 73793637d1
5 changed files with 18 additions and 4 deletions

14
.editorconfig Normal file
View File

@ -0,0 +1,14 @@
# editorconfig.org
root = true
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[Makefile]
indent_style = tab

View File

@ -1,3 +1,3 @@
language: node_js
node_js:
- 0.6
- 0.6

View File

@ -357,4 +357,4 @@ Complete rewrite of the library. For full details, head to the upgrading doc at
- Bug fixes
## v1.0.0
- **Initial release**
- **Initial release**

View File

@ -173,4 +173,4 @@
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS

View File

@ -5,4 +5,4 @@
"dependencies": {
"jquery": "~1.8.0"
}
}
}