Commit d71552bd authored by ElenaSubbotina's avatar ElenaSubbotina

Merge remote-tracking branch 'origin/hotfix/v5.0.7' into develop

# Conflicts:
#	ASCOfficeDocFile/DocFormatTest/DocFormatTest.cpp
parents 6a013840 548c5ab6
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment