Merge pull request #1479 from julienbourdeau/master

Rework PrestaShop.gitignore

Prestashop.gitignore

@@ -1,29 +1,25 @@
-# Directories content
-cache/class_index.php
-cache/smarty/cache/*
-!cache/smarty/cache/index.php
-cache/smarty/compile/*
-!cache/smarty/compile/index.php
-cache/tcpdf/*
-!cache/tcpdf/index.php
+# Private files
+# The following files contain your database credentials and other personal data.
 
+config/settings.*.php
+
+# Cache, temp and generated files
+# The following files are generated by PrestaShop.
+
+admin-dev/autoupgrade/
+cache/
 config/xml/*.xml
-config/settings.inc.php
+log/
+*sitemap.xml
+themes/*/cache/
+modules/*/config*.xml
 
-log/*.log
+# Site content
+# The following folders contain product images, virtual products, CSV's, etc.
 
-img/*
-!img/index.php
-!img/*/index.php
-
-tools/smarty*/cache/*.php
-!tools/smarty*/cache/index.php
-tools/smarty*/compile/*.php
-!tools/smarty*/compile/index.php
-
-themes/default/cache/*.js
-themes/default/cache/*.css
-
-# Ignore files on root directory
-robots.txt
-sitemap.xml
+admin-dev/backups/
+admin-dev/export/
+admin-dev/import/
+download/
+img/
+upload/