Merge branch 'v0.11' into stable

[github/shaarli/Shaarli.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c54d9b693d056a0e8abad358464e5625356753e1..b21d2118f857712e35854e25266ab8ffcfa5713b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ phpdoc.xml
 
 # User plugin configuration
 plugins/*/config.php
+plugins/default_colors/default_colors.css
 
 # HTML documentation
 doc/html/