Maxim Kadushkin b041083933 Merge branch 'feature/reactjs-container-component-with-mobx' into feature/mobile-apps-on-reactjs ... # Conflicts: # apps/documenteditor/mobile/locale/en.json # apps/documenteditor/mobile/src/components/app.jsx # apps/documenteditor/mobile/src/components/settings/Settings.jsx # apps/documenteditor/mobile/src/components/settings/document-settings/DocumentSettings.jsx # apps/documenteditor/mobile/src/js/routes.js # apps/documenteditor/mobile/src/pages/home.jsx # apps/documenteditor/mobile/src/store/reducers/root.js # apps/documenteditor/mobile/src/store/store.js		2020-10-16 11:37:47 +03:00
..
embed	[Embedded] Send config.encryptionKeys to sdk	2020-05-22 18:40:38 +03:00
main	[common] header's refactoring	2020-07-29 23:14:11 +03:00
mobile	Merge branch 'feature/reactjs-container-component-with-mobx' into feature/mobile-apps-on-reactjs	2020-10-16 11:37:47 +03:00