Merge remote-tracking branch 'origin/master'

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a69789254f70bb08d960d2733616e6476470d2fe..10a7187cf3bdb3ff2b468fcd2cdf62f34181d31f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
 .htconfig.php
 \#*
-wip
-include/jquery-1.4.2.min.js
\ No newline at end of file
+wip/*
+include/jquery-1.4.2.min.js
+*.log
+*.out
+*.version*
+push*
+home.html