Tatiana Lopaeva fc65e43bfc Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 ... # Conflicts: # products/ASC.Files/Client/public/locales/en/Translations.json # products/ASC.Files/Client/public/locales/ru/Translations.json		2021-08-20 12:58:38 +03:00
..
Client	Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0	2021-08-20 12:58:38 +03:00
Core	Merge branch 'develop' into bugfix/canShare	2021-08-16 11:07:30 +03:00
Server	Added asp logging	2021-08-08 16:19:54 +03:00
Service	Merge pull request #319 from ONLYOFFICE/feature/log	2021-08-12 15:00:53 +03:00
Tests	Files: fixed tests	2021-08-17 15:50:05 +03:00