Merge branch 'master' of https://github.com/coreui/coreui

Author: mrholek

.eslintrc.json

@@ -141,7 +141,7 @@
     "jsx-quotes": "error",
     "key-spacing": "off",
     "keyword-spacing": "error",
-    "linebreak-style": ["error", "unix"],
+    "linebreak-style": 0,
     "line-comment-position": "off",
     "lines-around-comment": "off",
     "lines-around-directive": "error",

.gitignore

@@ -1 +1,3 @@
+.DS_Store
+.idea
 node_modules