Viktor Fomin 551c623541 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns ... # Conflicts: # packages/asc-web-components/campaigns-banner/index.js # products/ASC.Files/Client/src/components/Article/Body/index.js		2021-09-08 14:36:10 +03:00
..
ASC.Calendar	Security: added new method	2021-08-18 17:04:16 +03:00
ASC.CRM	Added notify	2021-09-03 18:04:06 +03:00
ASC.Files	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns	2021-09-08 14:36:10 +03:00
ASC.Mail	Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop	2021-08-12 16:19:23 +03:00
ASC.People	Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files	2021-09-07 12:57:13 +03:00
ASC.Projects	Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop	2021-08-12 16:19:23 +03:00