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
..
api/documents	Merge branch 'hotfix/v5.6.0' into develop	2020-07-28 22:15:23 +03:00
common	[DE] changed stylesheets for popover with view inside	2020-10-16 11:11:26 +03:00
documenteditor	Merge branch 'feature/reactjs-container-component-with-mobx' into feature/mobile-apps-on-reactjs	2020-10-16 11:37:47 +03:00
presentationeditor	Merge branch 'hotfix/v5.6.0' into develop	2020-07-28 22:15:23 +03:00
spreadsheeteditor	[common] debug centering for doc title	2020-07-29 22:50:07 +03:00