aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-03-30 16:05:43 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-03-30 16:05:43 +0200
commit9acccb2b90ff5276c0cc84b3b006c7a393c53786 (patch)
tree073576560eaa6e00266c3e85a5e76df6e1dca032 /.gitignore
parent05d9035aaa55c3b38fcb15d799644e3c5eda5f11 (diff)
parent18da7efa27fcff8fb2b3b679938954e712427de9 (diff)
downloadvolse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.gz
volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.tar.bz2
volse-hubzilla-9acccb2b90ff5276c0cc84b3b006c7a393c53786.zip
Merge remote-tracking branch 'friendika-master/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 10a7187cf..837b2e876 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+favicon.*
.htconfig.php
\#*
wip/*