Maxim Kadushkin 5b57ee760b Merge branch 'develop' into feature/colors-table ... # Conflicts: # apps/common/main/resources/less/loadmask.less # apps/documenteditor/main/app/controller/Main.js # apps/documenteditor/main/app/view/FileMenuPanels.js # apps/documenteditor/main/resources/less/toolbar.less # apps/presentationeditor/main/app/controller/Main.js # apps/presentationeditor/main/app/controller/RightMenu.js # apps/presentationeditor/main/app/view/FileMenuPanels.js # apps/presentationeditor/main/app/view/SlideSettings.js # apps/spreadsheeteditor/main/app/controller/Main.js # apps/spreadsheeteditor/main/app/view/FileMenuPanels.js # apps/spreadsheeteditor/main/resources/less/toolbar.less		2021-02-06 14:42:56 +03:00
..
embed	Update common.less	2020-09-09 15:25:14 +03:00
main	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
mobile	Add new parameters to "permissions" section of config: editCommentAuthorOnly (can edit your own comments only if true), deleteCommentAuthorOnly (can delete your own comments only if true).	2021-02-04 12:39:56 +03:00
Analytics.js	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
Gateway.js	Add/remove file to favorites	2020-12-14 22:45:30 +03:00
IrregularStack.js	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
locale.js	[all] debug locked file open	2020-04-29 20:54:48 +03:00