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
..
api	Merge branch 'develop' into feature/team-template	2021-04-20 12:05:19 +03:00
components	Web: Files: fixed newItem styles	2021-04-19 14:16:42 +03:00
constants	Web: Files: added ConflictResolveDialog, refactoring files operations	2021-04-16 16:04:50 +03:00
desktop	Web: Move toastr function to Web Client (mf: "studio/toastr")	2021-03-03 16:46:04 +03:00
history	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00
store	Merge branch 'develop' into feature/team-template	2021-04-20 12:05:19 +03:00
utils	Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile	2021-04-16 20:23:08 +03:00
index.js	Web: Deleted useless exports.	2021-03-17 16:45:36 +03:00
package.json	Web: Added SelectedFrame	2021-04-13 09:35:07 +03:00