status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

pull from dev, conflict fix

This commit is contained in:
Mikhail Mikheev 2019-12-16 16:07:46 +04:00
parent cbb3908f1b 405d8ba336
commit 251c9b9c0c
2 changed files with 730 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readme.md
View File

@ -54,7 +54,7 @@ yarn build-mainnet
1. Run `transaction-history-service` 1. Run `transaction-history-service`
``` ```
git clone https://github.com/gnosis/safe-transaction-service.git git clone https://github.com/gnosis/safe-transaction-service.git
cd safe-transaction-history cd safe-transaction-service
git checkout develop git checkout develop
docker-compose build docker-compose build
# it comes enabled by default in docker-compose # it comes enabled by default in docker-compose

778
yarn.lock
View File

File diff suppressed because it is too large Load Diff