diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-09-25 18:50:43 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-09-25 18:50:43 +0200 |
| commit | 1db998348e8850db79c4afa2d057fa31fb6bc12c (patch) | |
| tree | 5e334c1b82e8be12799b729a0234f8cc0f19bb74 /.gitignore | |
| parent | 4b9d8f2fa62b62616d2d1043a6faa39d40989070 (diff) | |
| parent | 4131d42c793c3db50b6184e5084332d5415c91cb (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index f6e8e993b..269044ea9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,11 +2,11 @@ application/cache/* !application/cache/index.html -!application/cache/.htaccess application/logs/* !application/logs/index.html -!application/logs/.htaccess + +!application/*/.htaccess composer.lock @@ -28,4 +28,4 @@ user_guide_src/cilexer/pycilexer.egg-info/* *.sublime-workspace *.sublime-project /tests/tests/ -/tests/results/
\ No newline at end of file +/tests/results/ |