Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

This commit is contained in:
Weblate 2016-08-30 14:05:32 +02:00
commit 7563c88c9b

4
.gitignore vendored
View File

@ -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