Maxim Kadushkin 482a7d11bf Merge branch 'develop' into feature/desktop-new ... # Conflicts: # apps/documenteditor/main/app/controller/Main.js # apps/documenteditor/main/app/controller/Toolbar.js # apps/presentationeditor/main/app/controller/Main.js # apps/spreadsheeteditor/main/app/controller/Main.js		2018-02-22 02:41:49 +03:00
..
DocumentHolder.js	change license to 2017	2017-01-17 17:58:08 +03:00
LeftMenu.js	Merge branch 'develop' into feature/desktop-new	2018-02-22 02:41:49 +03:00
Main.js	Merge branch 'develop' into feature/desktop-new	2018-02-22 02:41:49 +03:00
RightMenu.js	[PE] Added width, height for table settings in the right panel. Distribute rows and columns in table.	2018-02-06 15:06:01 +03:00
Statusbar.js	Fix Bug 35547.	2017-11-10 12:00:47 +03:00
Toolbar.js	[DE][PE][SSE] synchronize extra buttons state through events	2018-02-16 02:56:17 +03:00
Viewport.js	[DE][PE][SSE] synchronize extra buttons state through events	2018-02-16 02:56:17 +03:00