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
..
about	webapps added	2016-03-10 21:48:53 -03:00
combo-border-size	[DE] В настройки автофигур и текстартов добавлен тип линии.	2016-06-29 15:47:08 +03:00
controls	Add mexico flag.	2018-02-16 16:07:22 +03:00
dimension-picker	Move common icons.	2018-02-20 15:29:01 +03:00
header	Merge branch 'develop' into feature/desktop-new	2018-02-02 16:18:07 +03:00
hsbcolorpicker	webapps added	2016-03-10 21:48:53 -03:00
load-mask	webapps added	2016-03-10 21:48:53 -03:00
plugin	[DE] Панель плагинов изменена в соответствии с макетами.	2016-06-29 10:58:10 +03:00
right-panels	Change icons in the right panel.	2018-02-20 19:36:28 +03:00
toolbar	Move common icons.	2018-02-20 15:29:01 +03:00