Viktor Fomin b3fd47a216 Merge branch 'feature/CampaignsBanner' of github.com:ONLYOFFICE/AppServer into feature/personal ... # Conflicts: # products/ASC.Files/Client/src/components/Article/Body/index.js		2021-07-02 16:42:05 +03:00
..
Client	Merge branch 'feature/CampaignsBanner' of github.com:ONLYOFFICE/AppServer into feature/personal	2021-07-02 16:42:05 +03:00
Core	Files: removed ItemDictionary	2021-06-30 12:39:08 +03:00
Server	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner	2021-07-02 16:12:06 +03:00
Service	merge from develop	2021-06-23 16:10:46 +03:00
Tests	remove itemList in tests	2021-06-29 12:47:32 +03:00