diff options
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 75be5b0c2..050902f17 100755 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,8 @@ doc/html/ .zotshrc # external repositories for themes/addons extend/ - +# files generated by phpunit +tests/results/ ## exclude IDE files # config files and folders from Eclipse @@ -63,6 +64,8 @@ nbproject/ ## composer # locally installed composer binary composer.phar +# allow composer.lock, as it is required to have a common state +!composer.lock # vendor/ is managed by composer, no need to include in our repository # requires new deployment and needs discussion first #vendor/ |