Viktor Fomin 753d0b0605 Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime ... # Conflicts: # packages/asc-web-common/store/SettingsStore.js # web/ASC.Web.Client/public/locales/en/Settings.json		2022-06-01 14:26:24 +03:00
..
images	merge	2022-03-24 20:56:51 +03:00
locales	Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime	2022-06-01 14:26:24 +03:00
index.html	Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner	2022-05-30 15:33:17 +03:00