Continued:

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 26d33947724a5a8c00374567fafa3499c8d10b27..12dd3b49ea772ae0129944dc48c8811ed0da6326 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,9 +23,11 @@ report/
 .buildpath
 .externalToolBuilders
 .settings
+
 #ignore OSX .DS_Store files
 .DS_Store
 
+#ignore NetBeans IDE's private files (at least)
 /nbproject/private/
 
 #ignore smarty cache
@@ -60,3 +62,6 @@ vendor/*
 
 #ignore addons/ directory
 addons/
+
+#Ignore .htaccess as it may contain local changes
+.htaccess