Merge tag 'v0.9.7' into stable

Release v0.9.7

1 files changed, 13 insertions, 3 deletions

diff --git a/.dockerignore b/.dockerignore
index 9a18e085..cdd0a894 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,7 @@
 # Docker-ignore
-# Note: .git/ is kept for HTML documentation generation
+.dev
+.git
+.github
 tests
 
 # Shaarli runtime resources
@@ -17,12 +19,12 @@ tmp/*
 *.rtpl.php
 
 # 3rd-party dependencies
-composer.lock
 vendor/
 
 # Release archives
-*.tar
+*.tar.gz
 *.zip
+inc/languages/*/LC_MESSAGES/shaarli.mo
 
 # Development and test resources
 coverage
@@ -32,3 +34,11 @@ phpmd.html
 
 # User plugin configuration
 plugins/*/config.php
+
+# HTML documentation
+doc/html/
+
+# 3rd party themes
+tpl/*
+!tpl/default
+!tpl/vintage