aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-09-05 21:05:24 +0200
committerfabrixxm <fabrix.xm@gmail.com>2011-09-05 21:05:24 +0200
commit2f5a34ad1791f01cacb3b86c11501f0e11c67df4 (patch)
treedd9242b14387c833346f4172e3f190659db56ff7 /.gitignore
parent5ec4a4e6deb5d28cbfab54093f8b4180912738d4 (diff)
parent08e54234e30c10e3130b7d71caba9fd43e3593e3 (diff)
downloadvolse-hubzilla-2f5a34ad1791f01cacb3b86c11501f0e11c67df4.tar.gz
volse-hubzilla-2f5a34ad1791f01cacb3b86c11501f0e11c67df4.tar.bz2
volse-hubzilla-2f5a34ad1791f01cacb3b86c11501f0e11c67df4.zip
Merge branch 'newui' of github.com:fabrixxm/friendika into newui
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 41ec42389..a2d1ffa54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ include/jquery-1.4.2.min.js
*.version*
favicon.*
home.html
+*~