Merge branch 'ntwb-editorconfig' into 3.0.0-wip

5 files changed, 18 insertions, 4 deletions

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..ad9d6beae
--- /dev/null
+++ b/.editorconfig
@@ -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
diff --git a/.travis.yml b/.travis.yml
index b8e1f1720..2d26206d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - 0.6
\ No newline at end of file
+  - 0.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 154fb2c52..f33f97937 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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**
diff --git a/LICENSE b/LICENSE
index 2bb9ad240..d9a10c0d8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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
diff --git a/component.json b/component.json
index 96617807d..f246145ee 100644
--- a/component.json
+++ b/component.json
@@ -5,4 +5,4 @@
   "dependencies": {
     "jquery": "~1.8.0"
   }
-}
\ No newline at end of file
+}