Merge branch 'master' into master-m-dev
# Conflicts: # package.json # src/components-v2/utils/modals/GenericModal/index.js # src/components/ConnectButton/index.jsx # src/logic/safe/utils/safeVersion.js # src/logic/tokens/store/actions/fetchTokens.js # src/routes/safe/components/AddressBook/index.jsx # src/routes/safe/components/Balances/SendModal/index.jsx # src/routes/safe/components/Balances/SendModal/screens/ChooseTxType/index.jsx # src/routes/safe/components/Balances/SendModal/screens/SendCustomTx/index.jsx # src/routes/safe/components/Balances/index.jsx # src/routes/safe/components/Balances/style.js # src/routes/safe/components/Layout.jsx # src/routes/safe/components/Settings/SafeDetails/index.jsx # src/routes/safe/components/Settings/UpdateSafeModal/index.jsx # src/routes/safe/components/Settings/index.jsx # src/routes/safe/components/Transactions/TxsTable/index.jsx # src/routes/safe/container/actions.js # src/routes/safe/container/index.jsx # src/routes/safe/store/actions/fetchSafe.js # src/routes/safe/store/actions/fetchTransactions.js # src/routes/safe/store/reducer/safe.js # src/store/index.js # yarn.lock
This commit is contained in:
fernandomg
commit
efebbac5d7