Merge pull request #12587 from annando/inbox-gsid

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 56b90b0e8e5a6abc483f834649827e7d4d2f5c03..3db593f1d4fcd8d28368ee00f2107090f26435ad 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,10 +10,9 @@ home.html
 robots.txt
 
 #ignore local config
-/config/local.config.php
-/config/addon.config.php
-/config/local.ini.php
-/config/addon.ini.php
+!/config/local-sample.config.php
+/config/*.config.php
+/config/*.ini.php
 
 #ignore documentation, it should be newly built
 /doc/api
@@ -90,3 +89,11 @@ venv/
 #ignore avatar picture cache path
 /avatar
 
+#Ignore autotest results
+autotest-results.xml
+
+#ignore phpunit result cache
+tests/.phpunit.result.cache
+
+#ignore .php_cs (local copy)
+.php_cs