diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..46b342614
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# Auto detect text files and perform LF normalization,
+# when the file has been committed with CRLF, no conversion is done.
+* text=auto 
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 4832939cc..d49eef35e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,23 @@
-/npm-debug.log
-/node_modules
-/dist
-/build
-.idea
 *~
-/documento.odt
-/src/index.html
+.idea
+/assets/style/less/g3w-skins-custom/
+/build
 /config.js
-/test/
-/deploy/
-/src/libs/sdk/g3w-ol3/config/config.js
-/src/libs/sdk/config/dev/
-/src/plugins/
-/src/app/dev/
-/src/config/keys/index.js
 /cypress.env.json
+/deploy/
+/dist
+/documento.odt
+/g3w-admin/
+/node_modules
+/npm-debug.log
+/test/
 /test/config/
+/src/app/__dev__/
 /src/app/core/iframe/test/
+/src/app/dev/
 /src/config/dev/index.js
-/assets/style/less/g3w-skins-custom/
-/src/app/__dev__/
+/src/config/keys/index.js
+/src/libs/sdk/config/dev/
+/src/libs/sdk/g3w-ol3/config/config.js
+/src/index.html
+/src/plugins/
\ No newline at end of file