Merge pull request #798 from ArthurHoaro/feature/composer-lock

[github/shaarli/Shaarli.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 19f3dc836873ea5196e2bdece1477de4d4d937c8..984d9d1f410d688e5e61b1a626df6485879632ef 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ pagecache
 *.rtpl.php
 
 # 3rd-party dependencies
-composer.lock
 vendor/
 
 # Release archives
@@ -32,3 +31,4 @@ plugins/*/config.php
 # 3rd party themes
 tpl/*
 !tpl/default
+!tpl/vintage