lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/release-7.5.0' into merge-release-7.5.0-into-dev

Browse source
This commit is contained in:
Taranto 2021-04-21 17:43:13 +01:00
commit 7b3b2fb72d
47 changed files with 374 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

4
new-lamassu-admin/src/routing/routes.js
View file

@ -17,7 +17,7 @@ import AuthRegister from 'src/pages/AuthRegister'
import Blacklist from 'src/pages/Blacklist'
import Cashout from 'src/pages/Cashout'
import Commissions from 'src/pages/Commissions'
import ConfigMigration from 'src/pages/ConfigMigration'
// import ConfigMigration from 'src/pages/ConfigMigration'
import { Customers, CustomerProfile } from 'src/pages/Customers'
import Dashboard from 'src/pages/Dashboard'
import Funding from 'src/pages/Funding'
@ -320,7 +320,7 @@ const Routes = () => {
<Route path="/machines" component={Machines} />
<Route path="/wizard" component={Wizard} />
<Route path="/register" component={AuthRegister} />
<Route path="/configmigration" component={ConfigMigration} />
{/* <Route path="/configmigration" component={ConfigMigration} /> */}
{flattened.map(({ route, component: Page, key }) => (
<Route path={route} key={key}>
<Transition