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	Development (#368)	2019-12-17 17:56:19 +01:00
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	(Feature) erc721 feature implementation (#570)	2020-03-18 17:24:24 -03:00
utils	Apps fixes (#871)	2020-05-05 14:24:46 -03:00
index.js	(add) linter sorting rules (#614)	2020-02-28 10:58:40 +01:00