Merge remote-tracking branch 'origin/release/v5.3.0' into develop

This commit is contained in:
ElenaSubbotina
2019-03-20 18:53:57 +03:00
48 changed files with 448 additions and 356 deletions

2
.gitignore vendored
View File

@ -63,6 +63,6 @@ X2tConverter/Common/DocxFormat/DocxFormatLib/Makefile
*.zip
*.tar.gz
**/*.build/
*.dat
*.txt
*.log