Maxim Kadushkin a97c7fc4da Refactoring: rename timing to transition ... # Conflicts: # apps/presentationeditor/main/app/view/SlideSettings.js # apps/presentationeditor/mobile/app/controller/Toolbar.js # apps/presentationeditor/mobile/app/controller/edit/EditContainer.js # apps/presentationeditor/mobile/app/controller/edit/EditSlide.js		2021-01-24 17:48:49 +03:00
..
DocumentHolder.js	[PE] Fix Bug 42915	2020-01-27 18:06:26 +03:00
LeftMenu.js	Add api event onRequestCreateNew for creating files	2020-06-15 20:05:19 +03:00
Main.js	Merge branch 'hotfix/v5.6.0' into develop	2020-07-28 22:15:23 +03:00
RightMenu.js	Refactoring: rename timing to transition	2021-01-24 17:48:49 +03:00
Statusbar.js	[PE] Refactoring language button	2019-07-15 17:57:46 +03:00
Toolbar.js	Refactoring: rename timing to transition	2021-01-24 17:48:49 +03:00
Viewport.js	[PE] Fix zoom buttons	2019-12-03 15:50:10 +03:00