X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=.gitignore;h=db1c3c1306498253b3694991dbc5a1fd9e393b38;hb=refs%2Fheads%2Ffixes%2Fe-notice-mod-admin;hp=cd299f2d859153ebc7169fe30918a5cdd4b14568;hpb=d9451ef969c2242b85401982669b7721483d107b;p=friendica.git

diff --git a/.gitignore b/.gitignore
index cd299f2d85..db1c3c1306 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,56 +1,71 @@
-favicon.*
-.htconfig.php
-.htpreconfig.php
-\#*
-include/jquery-1.4.2.min.js
-*.log
-*.out
-*.version*
-favicon.*
-home.html
-addon
-*~
-robots.txt
-
-#ignore documentation, it should be newly built
-doc/html
-
-#ignore reports, should be generted with every build
-report/
-
-#ignore config files from eclipse, we don't want IDE files in our repository
-.project
-.buildpath
-.externalToolBuilders
-.settings
-#ignore OSX .DS_Store files
-.DS_Store
-
-/nbproject/private/
-
-#ignore smarty cache
-/view/smarty3/compiled/
-
-#ignore cache folders
-/privacy_image_cache/
-/photo/
-/proxy/
-nbproject
-
-#ignore vagrant dir
-.vagrant/
-
-#ignore local folder
-/local/
-
-#ignore config files from Visual Studio
-/.vs/
-/php_friendica.phpproj
-/php_friendica.sln
-/php_friendica.phpproj.user
-
-#ignore things from transifex-client
-venv/
-
-#ignore git projects in vendor
-vendor/**/.git
+favicon.*
+.htconfig.php
+.htpreconfig.php
+\#*
+*.log
+*.out
+*.version*
+home.html
+
+*~
+robots.txt
+
+#ignore local config
+/config/local.ini.php
+/config/addon.ini.php
+
+#ignore documentation, it should be newly built
+/doc/html
+
+#ignore reports, should be generated with every build
+report/
+
+#ignore config files from eclipse, we don't want IDE files in our repository
+.project
+.buildpath
+.externalToolBuilders
+.settings
+
+#ignore OSX .DS_Store files
+.DS_Store
+
+#ignore NetBeans IDE's private files (at least)
+/nbproject/private/
+
+#ignore smarty cache
+/view/smarty3/compiled/
+
+#ignore cache folders
+/privacy_image_cache/
+/photo/
+/proxy/
+nbproject
+
+#ignore vagrant dir
+.vagrant/
+
+#ignore local folder
+/local/
+
+#ignore config files from Visual Studio
+/.vs/
+/php_friendica.phpproj
+/php_friendica.sln
+/php_friendica.phpproj.user
+
+#ignore things from transifex-client
+venv/
+
+#ignore Composer dependencies
+/vendor
+/view/asset
+
+#ignore config files from JetBrains
+/.idea
+
+#ignore addons directory
+/addons
+/addon
+
+#ignore .htaccess
+.htaccess