diff options
| author | Florian Pritz <bluewind@xinu.at> | 2018-03-20 17:30:02 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2018-03-20 17:30:02 +0100 |
| commit | 006cf0764295d37daa597f4ea9cf31abb75d1b68 (patch) | |
| tree | 4f40341fef42c760330e2caa501881ab195a67b2 /.gitignore | |
| parent | 61e2a033717a4669117696d0b6913474e3f57954 (diff) | |
| parent | 02a0518e1c56ba3506f370362ac5ebdb8a138312 (diff) | |
Merge tag 'ci-upstream/3.1.7' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index cc93e5a84..3ea68afd3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,11 +13,11 @@ is_installed application/cache/* !application/cache/index.html -!application/cache/.htaccess application/logs/* !application/logs/index.html -!application/logs/.htaccess + +!application/*/.htaccess public_html/data/js/main.min.js /vendor @@ -43,3 +43,5 @@ user_guide_src/cilexer/pycilexer.egg-info/* *.stTheme.cache *.sublime-workspace *.sublime-project +/tests/tests/ +/tests/results/ |