Fixes applied: (#5399)

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 12dd3b49ea772ae0129944dc48c8811ed0da6326..114bb5dbb9a5054ca0d1c71fcdb054979c15a176 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,20 +2,22 @@ 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.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
@@ -54,14 +56,13 @@ nbproject
 #ignore things from transifex-client
 venv/
 
-#ignore all in 'vendor' as `utils/composer.phar install` will bring it back
-vendor/*
+#ignore Composer dependencies
+/vendor
+/view/asset
 
 #ignore config files from JetBrains
 /.idea
 
-#ignore addons/ directory
-addons/
-
-#Ignore .htaccess as it may contain local changes
-.htaccess
+#ignore addons directory
+/addons
+/addon
\ No newline at end of file