fernandomg 5c95d1f220 Merge branch 'development' into 536-notifications-status-labels-sync ...

# Conflicts:
#	src/routes/safe/components/Balances/SendModal/screens/SendCollectible/index.jsx

2020-05-11 08:49:15 -03:00

..

assets

…

components

Merge branch 'development' into 536-notifications-status-labels-sync

2020-05-11 08:49:15 -03:00

components-v2

Merge branch 'development' into 536-notifications-status-labels-sync

2020-05-07 19:25:19 -03:00

config

v2.0.0 (#806)

2020-04-24 19:24:56 +04:00

logic

Merge branch 'development' into 536-notifications-status-labels-sync

2020-05-11 08:49:15 -03:00

routes

Merge branch 'development' into 536-notifications-status-labels-sync

2020-05-11 08:49:15 -03:00

store

(Fix) - 772 safe zero balances (#832)

2020-05-06 17:03:59 -03:00

test

Merge branch 'development' into 536-notifications-status-labels-sync

2020-05-07 19:25:19 -03:00

theme

…

utils

Apps fixes (#871)

2020-05-05 14:24:46 -03:00

index.js

…