diff options
| author | Michal Čihař <michal@cihar.com> | 2016-08-30 15:05:12 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2016-08-30 15:05:12 +0300 |
| commit | 563398815dc630f387cd11d6389a6b403c7d9cd5 (patch) | |
| tree | 97733217b6e553762dbccd986ffea87a83b909f9 /.gitignore | |
| parent | 52fe0f358dc27a182eb461146edfb49a156e4362 (diff) | |
| parent | ee1878d3caad4c938a252d993d7583e66ad09d39 (diff) | |
Merge branch 'QA_4_6'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index f82c3f6d6a..41bd940970 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ # Upload/save dirs /upload/ /save/ +/tmp/ # For setup script /config/ # ctags @@ -22,8 +23,9 @@ phpmyadmin.wpj .idea .netbeans *.sw[op] -# IIS files +# Web server files web.config +.htaccess # Locales /locale/ # Backups |