TatianaLopaeva 0f3eb1350b Merge branch 'develop' into feature/team-template ... # Conflicts: # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json		2021-04-20 12:05:19 +03:00
..
images	Big Fix commit:	2021-03-22 00:34:21 +03:00
locales	Merge branch 'develop' into feature/team-template	2021-04-20 12:05:19 +03:00
favicon.ico	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
index.html	Web: Moved ipl-progress-indicator to NavMenu	2021-03-18 22:26:52 +03:00
manifest.json	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00