diff options
author | Friendika <info@friendika.com> | 2011-09-27 01:29:08 -0700 |
---|---|---|
committer | Friendika <info@friendika.com> | 2011-09-27 01:29:08 -0700 |
commit | 8c6e7a24cd1dedc2e34cf41f23df3f070a582b2e (patch) | |
tree | 2dab0c47bcafd00bd53d14aa05de5b5856bac71c /.gitignore | |
parent | 2118dd316007650bec1ad36a5ae39c1c5f929d25 (diff) | |
parent | 916633ba3461dcd5746bbe66c8dc951535efda14 (diff) | |
download | volse-hubzilla-8c6e7a24cd1dedc2e34cf41f23df3f070a582b2e.tar.gz volse-hubzilla-8c6e7a24cd1dedc2e34cf41f23df3f070a582b2e.tar.bz2 volse-hubzilla-8c6e7a24cd1dedc2e34cf41f23df3f070a582b2e.zip |
Merge branch 'pull'
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index cbdf03673..3dfb8a903 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ include/jquery-1.4.2.min.js favicon.* home.html addon +*~ + |