Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f724ded80816fe670c51be813850d81068f4656c..b9289b7c2af432167ff68d572b7aad8610965f3e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ nbproject
 htaccess-sample
 installer.txt
 extlib/DB.php
+.gitmodules