Merge branch 'pull'

[friendica.git] / .gitignore

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