Merge pull request #6694 from Quix0r/rewrites/added-missing-var-init

[friendica.git/.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b75c19a..0d18ab0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,23 +2,24 @@ favicon.*
 .htconfig.php
 .htpreconfig.php
 \#*
-include/jquery-1.4.2.min.js
 *.log
 *.out
 *.version*
-favicon.*
 home.html
-addon
+
 *~
 robots.txt
 
 #ignore local config
+/config/local.config.php
+/config/addon.config.php
 /config/local.ini.php
+/config/addon.ini.php
 
 #ignore documentation, it should be newly built
-doc/html
+/doc/html
 
-#ignore reports, should be generted with every build
+#ignore reports, should be generated with every build
 report/
 
 #ignore config files from eclipse, we don't want IDE files in our repository
@@ -64,5 +65,12 @@ venv/
 #ignore config files from JetBrains
 /.idea
 
-#ignore addons/ directory
-addons/
+#ignore addons directory
+/addons
+/addon
+
+#ignore .htaccess
+.htaccess
+
+#ignore filesystem storage default path
+/storage