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

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

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