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
..
lib	Merge branch 'develop' into feature/desktop-new	2018-02-02 16:18:07 +03:00
resources	Merge branch 'develop' into feature/desktop-new	2018-02-02 16:18:07 +03:00