Maxim Kadushkin d3163b0be0 Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-de ... # Conflicts: # apps/common/mobile/resources/less/ios/icons.less # apps/common/mobile/resources/less/material/icons.less		2021-03-10 10:41:56 +03:00
..
locale	Merge branch 'feature/mobile-apps-on-reactjs-pe-edit-settings' into feature/mobile-apps-on-reactjs	2021-02-03 23:56:08 +03:00
resources/img	[PE mobile] changed less sources	2020-11-25 22:52:24 +03:00
src	Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-de	2021-03-10 10:41:56 +03:00