Merge pull request #920 from virtualtam/documentation/rest-3rd

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

diff --git a/.gitignore b/.gitignore
index 19f3dc836873ea5196e2bdece1477de4d4d937c8..d546f248af2b64bf8ed443f58585636e1e288871 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ pagecache
 *.rtpl.php
 
 # 3rd-party dependencies
-composer.lock
 vendor/
 
 # Release archives
@@ -29,6 +28,10 @@ phpmd.html
 # User plugin configuration
 plugins/*/config.php
 
+# HTML documentation
+doc/html/
+
 # 3rd party themes
 tpl/*
 !tpl/default
+!tpl/vintage