Merge branch 'newui' of github.com:fabrixxm/friendika into newui

[friendica.git] / .gitignore

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