diff options
author | VirtualTam <virtualtam@flibidi.net> | 2017-08-23 01:26:03 +0200 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2017-08-23 01:26:03 +0200 |
commit | 2c049b673acdd10125db9c3c271eef5bd3f5fc17 (patch) | |
tree | da67c958941502dd9c10d82be747559bbe2a062a /.gitignore | |
parent | bf82dcfeb38418f0b3d0f14f6c666ed04651e08f (diff) | |
parent | 1ea88ae7d1b7fb13e18f543e7c2ad99c4ccde19a (diff) | |
download | Shaarli-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-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -28,6 +28,9 @@ phpmd.html | |||
28 | # User plugin configuration | 28 | # User plugin configuration |
29 | plugins/*/config.php | 29 | plugins/*/config.php |
30 | 30 | ||
31 | # HTML documentation | ||
32 | doc/html/ | ||
33 | |||
31 | # 3rd party themes | 34 | # 3rd party themes |
32 | tpl/* | 35 | tpl/* |
33 | !tpl/default | 36 | !tpl/default |