Merge branch 'hotfix/1.0.4'

[galette.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 49701eec86dbed9eccfdd29f8dacfa5a4f8e52f0..5b4c30a0d3c8518ec5eab4f2ff2837dcbff963cd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ nbproject
 /galette/data/cache/*
 !/galette/data/cache/readme.txt
 !/galette/data/cache/.htaccess
+tempcache/
 
 .vimfiles*
 .exvim*
@@ -74,14 +75,18 @@ tests/coverage/
 tests/mageekguy.atoum.phar
 
 # Bundled libs
-galette/includes/tcpdf_*
-galette/includes/Zend*
-galette/includes/Analog*
-galette/password_compat*
 galette/vendor/
+node_modules/
+galette/webroot/assets/*
+galette/webroot/themes/*
+
+# Semantic UI
+semantic
+!ui/semantic
 
 # API documentation
 apidocs/
+build/
 
 #Backup files
 *~
@@ -89,4 +94,3 @@ apidocs/
 #Working stuff
 dbs/
 dist/
-.zanata-cache/