Keep up with master changes

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

diff --git a/.gitignore b/.gitignore
index 3ffedb31160484d614a949a2e651b65685549a34..9121905d84603c1943753a4e7bd8d981af6f9aec 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# Ignore data/, tmp/, cache/ and pagecache/
+# Shaarli runtime resources
 data
 tmp
 cache
@@ -9,15 +9,22 @@ pagecache
 .buildpath
 .project
 
-# Ignore raintpl generated pages
+# Raintpl generated pages
 *.rtpl.php
 
-# Ignore test dependencies
+# 3rd-party dependencies
 composer.lock
-/vendor/
+vendor/
 
-# Ignore test data & output
+# Release archives
+*.tar.gz
+*.zip
+
+# Development and test resources
 coverage
-tests/datastore.php
-tests/dummycache/
+doxygen
+sandbox
 phpmd.html
+
+# User plugin configuration
+plugins/*/config.php