diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-12-23 10:09:46 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-12-23 10:09:46 +0100 |
| commit | 3b9b03cf86979b28e7fa249133176bed84b0105c (patch) | |
| tree | 336dc8b8b9627e7f4a93e5c35fe3e98555274616 /.gitignore | |
| parent | 2e5a993f880d619aedf3693927e7b3e164fbfcc0 (diff) | |
| parent | ef39c1e94b5149a3019d417d08dc7c16c8aef9c1 (diff) | |
| download | volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.tar.gz volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.tar.bz2 volse-hubzilla-3b9b03cf86979b28e7fa249133176bed84b0105c.zip | |
Merge branch '2.0RC'
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index a5f149548..75be5b0c2 100755 --- a/.gitignore +++ b/.gitignore @@ -60,11 +60,13 @@ nbproject/ .idea/ -# composer files (at the moment composer is not officially supported and only used to add SabreDAV, we should add these) -composer.* - -# When we include composer we should exclude vendor/ +## composer +# locally installed composer binary +composer.phar +# vendor/ is managed by composer, no need to include in our repository +# requires new deployment and needs discussion first #vendor/ -# Exclude at least some vendor test files, examples, etc. -vendor/sabre/*/tests/ +# Exclude at least some vendor test files, examples, etc. so far +vendor/**/tests/ +vendor/**/Test/ vendor/sabre/*/examples/ |