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

fix: changes to adapt rebase

Browse source
This commit is contained in:
Sérgio Salgado 2021-02-02 18:45:44 +00:00 • committed by Josh Harvey
parent eb91d882c7
commit fff9523988
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
new-lamassu-admin/package-lock.json generated
View file

@ -17973,9 +17973,9 @@
"dev": true "dev": true
}, },
"nan": { "nan": {
"version": "2.14.2", "version": "2.12.1",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==",
"dev": true, "dev": true,
"optional": true "optional": true
}, },

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

@ -21,6 +21,7 @@ import ResetPassword from 'src/pages/Authentication/ResetPassword'
import Blacklist from 'src/pages/Blacklist' import Blacklist from 'src/pages/Blacklist'
import Cashout from 'src/pages/Cashout' import Cashout from 'src/pages/Cashout'
import Commissions from 'src/pages/Commissions' import Commissions from 'src/pages/Commissions'
import ConfigMigration from 'src/pages/ConfigMigration'
import { Customers, CustomerProfile } from 'src/pages/Customers' import { Customers, CustomerProfile } from 'src/pages/Customers'
import Dashboard from 'src/pages/Dashboard' import Dashboard from 'src/pages/Dashboard'
import Funding from 'src/pages/Funding' import Funding from 'src/pages/Funding'