Merge pull request #12628 from nupplaphil/bug/typeerror

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9044604f81d346727d785a834ed0584261f6d4c6..3db593f1d4fcd8d28368ee00f2107090f26435ad 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,13 +10,13 @@ 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/html
+/doc/api
+/doc/cache
 
 #ignore reports, should be generated with every build
 report/
@@ -84,4 +84,16 @@ venv/
 /bin/phpunit
 
 #Ignore cache file
-.php_cs.cache
\ No newline at end of file
+.php_cs.cache
+
+#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