Merge branch 'pull'

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100644 (file)
new mode 100755 (executable)
index e85d828..3dfb8a9
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,12 @@
+favicon.*
 .htconfig.php
 \#*
+include/jquery-1.4.2.min.js
+*.log
+*.out
+*.version*
+favicon.*
+home.html
+addon
+*~
+