diff options
| author | zotlabs <mike@macgirvin.com> | 2016-10-19 16:31:35 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-10-19 16:31:35 -0700 |
| commit | c79c1b391331ab7c8c0f01265a627ffae23d54e2 (patch) | |
| tree | 66d988e77e1af2b8695a9726a76fc7d5743a69a6 /.gitignore | |
| parent | 716a83d1f77e2d6f26b25ab03ffe130c11ef7feb (diff) | |
| parent | b926a4c67e4d7dcba01df91dddcc047abde246bb (diff) | |
| download | volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.tar.gz volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.tar.bz2 volse-hubzilla-c79c1b391331ab7c8c0f01265a627ffae23d54e2.zip | |
Merge branch 'dev' into pdo
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/ |