diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-07-05 07:11:57 +0200 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-07-05 07:11:57 +0200 |
| commit | 4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8 (patch) | |
| tree | 84184bd3aa80c896b8dceaf5a017297c7267f2cb /.gitignore | |
| parent | cfd59f6ac8848c19a0c451c378d2b770cafcbef0 (diff) | |
| parent | 2359783b9f6c0ec754c641453026712cf22e7cb6 (diff) | |
| download | volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.tar.gz volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.tar.bz2 volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.zip | |
Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 9b3b23a00..41ec42389 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,9 @@ favicon.* .htconfig.php \#* -wip/* include/jquery-1.4.2.min.js *.log *.out *.version* -push* -langup +favicon.* home.html |