Merge branch 'master' into develop

This commit is contained in:
Arin Alex 2018-02-26 23:18:39 +03:00
commit edb89544f8
2 changed files with 2508 additions and 1 deletions

View File

@ -90,7 +90,7 @@ contains(CONFIG,zint){
####Automatically build required translation files (*.qm) ####Automatically build required translation files (*.qm)
contains(CONFIG,build_translations){ contains(CONFIG,build_translations){
LANGUAGES = ru es_ES ar fr LANGUAGES = ru es_ES ar fr zh
defineReplace(prependAll) { defineReplace(prependAll) {
for(a,$$1):result += $$2$${a}$$3 for(a,$$1):result += $$2$${a}$$3

File diff suppressed because it is too large Load Diff