Commit 73793637 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch 'ntwb-editorconfig' into 3.0.0-wip

parents e0d60b13 08de4136
11 merge requests!8635ignore Gruntfile.js in jekyll,!8339Fix broken links to navbar component in docs examples,!7674Clear float on all when navbar is collapsed - v3,!7680Added media queries breakpoint variables,!7775added some tests for tooltip title setter,!8157Close Me: Docs "Customize and Download" button fix,!7964commit fixes #7792,!8656Added rel="stylesheet" to CDN-Examples,!8527Inner properties move 1,!8245Interactive color picker - Closed: request against wrong branch,!7865Patch 2
Showing with 18 additions and 4 deletions
+18 -4
# 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
language: node_js
node_js:
- 0.6
\ No newline at end of file
- 0.6
......@@ -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**
\ No newline at end of file
- **Initial release**
......@@ -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
\ No newline at end of file
END OF TERMS AND CONDITIONS
......@@ -5,4 +5,4 @@
"dependencies": {
"jquery": "~1.8.0"
}
}
\ No newline at end of file
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment