Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index fea5fb91e02ededbbb2c0dbbaf54f954709b84ba..41ec42389f92291bf57d3eca9b2769cc00f0c4c4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
+favicon.*
 .htconfig.php
 \#*
-wip/*
 include/jquery-1.4.2.min.js
 *.log
 *.out
-push*
+*.version*
+favicon.*
 home.html