aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2017-08-23 01:26:03 +0200
committerVirtualTam <virtualtam@flibidi.net>2017-08-23 01:26:03 +0200
commit2c049b673acdd10125db9c3c271eef5bd3f5fc17 (patch)
treeda67c958941502dd9c10d82be747559bbe2a062a /.gitignore
parentbf82dcfeb38418f0b3d0f14f6c666ed04651e08f (diff)
parent1ea88ae7d1b7fb13e18f543e7c2ad99c4ccde19a (diff)
downloadShaarli-2c049b673acdd10125db9c3c271eef5bd3f5fc17.tar.gz
Shaarli-2c049b673acdd10125db9c3c271eef5bd3f5fc17.tar.zst
Shaarli-2c049b673acdd10125db9c3c271eef5bd3f5fc17.zip
Merge remote-tracking branch 'upstream/v0.9' into latest
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 984d9d1f..d546f248 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,9 @@ phpmd.html
28# User plugin configuration 28# User plugin configuration
29plugins/*/config.php 29plugins/*/config.php
30 30
31# HTML documentation
32doc/html/
33
31# 3rd party themes 34# 3rd party themes
32tpl/* 35tpl/*
33!tpl/default 36!tpl/default