Tatiana Lopaeva ca1cd06fad Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/public/images/plus.react.svg # packages/client/src/pages/PortalSettings/categories/common/branding.js # packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js # packages/client/src/pages/PortalSettings/index.js # packages/common/components/PrivateRoute/index.js		2022-10-04 17:13:46 +03:00
..
browserslist-config-asc	Web: Upgrade yarn to v3.2.2	2022-07-29 18:20:57 +03:00
client	Merge branch 'develop' into feature/stripe	2022-10-04 17:13:46 +03:00
common	Merge branch 'develop' into feature/stripe	2022-10-04 17:13:46 +03:00
components	Merge branch 'develop' into feature/stripe	2022-10-04 17:13:46 +03:00
editor	Web: Replaced the variable name.	2022-09-29 11:45:53 +03:00
login	Web: Moved dialog to common folder.	2022-09-19 15:12:49 +03:00
auto-changelog-2.3.1.tgz	Web: Restored work of auto-changelog and debug-info with local packages/auto-changelog-2.3.1.tgz	2022-08-26 17:59:52 +03:00