diff options
| author | friendica <info@friendica.com> | 2013-05-08 21:31:15 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-05-08 21:31:15 -0700 |
| commit | 735140e8d9f86c5ee0cbc29b50129e1abb73a647 (patch) | |
| tree | 60b09d1f96dabfc4175845eeee7142f17af9791f /.gitignore | |
| parent | cb0a90d6281a0fef998bfa342612fe47f91a2099 (diff) | |
| parent | cdcbe9772423d5373f6d0d4aa33700446a989340 (diff) | |
| download | volse-hubzilla-735140e8d9f86c5ee0cbc29b50129e1abb73a647.tar.gz volse-hubzilla-735140e8d9f86c5ee0cbc29b50129e1abb73a647.tar.bz2 volse-hubzilla-735140e8d9f86c5ee0cbc29b50129e1abb73a647.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to '.gitignore')
| -rwxr-xr-x[-rw-r--r--] | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 6cb36fb26..1a1b8259e 100644..100755 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ report/ #ignore OSX .DS_Store files .DS_Store + +#netbeans project folder +nbproject
|