diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-10-13 12:07:13 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-10-13 12:07:13 +0200 |
commit | d9f6275ebca035fec8331652c677981056793ccc (patch) | |
tree | 37a64baf4f0eba6b781040605965383d8aded2cc /.gitignore | |
parent | 38672ba0d1c722e5d6d33a58255ceb55e9410e46 (diff) | |
parent | d63ff87a009313141ae684ec447b902562ff6ee7 (diff) | |
download | Shaarli-d9f6275ebca035fec8331652c677981056793ccc.tar.gz Shaarli-d9f6275ebca035fec8331652c677981056793ccc.tar.zst Shaarli-d9f6275ebca035fec8331652c677981056793ccc.zip |
Merge branch 'v0.11' into stablestable
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -22,15 +22,17 @@ inc/languages/*/LC_MESSAGES/shaarli.mo | |||
22 | 22 | ||
23 | # Development and test resources | 23 | # Development and test resources |
24 | coverage | 24 | coverage |
25 | doxygen | ||
26 | sandbox | 25 | sandbox |
27 | phpmd.html | 26 | phpmd.html |
27 | phpdoc.xml | ||
28 | 28 | ||
29 | # User plugin configuration | 29 | # User plugin configuration |
30 | plugins/*/config.php | 30 | plugins/*/config.php |
31 | plugins/default_colors/default_colors.css | ||
31 | 32 | ||
32 | # HTML documentation | 33 | # HTML documentation |
33 | doc/html/ | 34 | doc/html/ |
35 | doc/phpdoc/ | ||
34 | 36 | ||
35 | # 3rd party themes | 37 | # 3rd party themes |
36 | tpl/* | 38 | tpl/* |
@@ -46,3 +48,6 @@ tpl/default/img | |||
46 | tpl/vintage/js | 48 | tpl/vintage/js |
47 | tpl/vintage/css | 49 | tpl/vintage/css |
48 | tpl/vintage/img | 50 | tpl/vintage/img |
51 | |||
52 | # Documented scripts | ||
53 | generate_templates.php | ||