Commit Graph

5 Commits

Author SHA1 Message Date
f9b54bffd4 Merge remote-tracking branch 'origin/hotfix/v5.1.4' into develop
# Conflicts:
#	DesktopEditor/common/Directory.h
#	DesktopEditor/common/File.h
2018-05-04 16:12:30 +03:00
d7e2bedc6b Openssl errors 2018-04-25 16:51:10 +03:00
983873d010 2 2018-04-10 18:53:17 +03:00
f501bf7930 remove curl for ios 2017-07-04 11:52:23 +03:00
20c5758525 Merged revision(s) from AVS/Sources/TeamlabOffice/branches/TeamlabOffice_v3.5_CPP:
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@66199 954022d7-b5bf-4e40-9824-e11837661b57
2016-05-21 00:45:20 +03:00