Maxim Kadushkin c8e9fe9a63 Merge branch 'develop' into feature/desktop-new ... # Conflicts: # apps/common/main/lib/util/utils.js		2018-02-02 16:18:07 +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	[SSE] Fix merging v.5.0.7 to develop.	2018-01-16 10:58:15 +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