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

[friendica.git] / .gitignore

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