diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-09-25 18:44:51 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-09-25 18:44:51 +0200 |
| commit | e76217041ddcae80f11b50b44a7d409b6722ad40 (patch) | |
| tree | 6f7dd444bfc5b4206a6e07169ad3c05b9b63fa4d /.gitignore | |
| parent | 9c07c3697bab0bf43e10daf59068497dd3a0a9fd (diff) | |
| parent | cf728703b5852591c160cbd9566a0e508dd5759a (diff) | |
Merge branch '3.1-stable'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 5982f9bad..269044ea9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,11 +2,13 @@ application/cache/* !application/cache/index.html -!application/cache/.htaccess application/logs/* !application/logs/index.html -!application/logs/.htaccess + +!application/*/.htaccess + +composer.lock user_guide_src/build/* user_guide_src/cilexer/build/* @@ -25,3 +27,5 @@ user_guide_src/cilexer/pycilexer.egg-info/* *.stTheme.cache *.sublime-workspace *.sublime-project +/tests/tests/ +/tests/results/ |