pull from dev, conflict fix

2019-12-16 16:07:46 +04:00 · 2019-12-16 16:07:46 +04:00 · 251c9b9c0c
parent cbb3908f1b 405d8ba336
commit 251c9b9c0c
2 changed files with 730 additions and 50 deletions
--- a/readme.md
+++ b/readme.md
@ -54,7 +54,7 @@ yarn build-mainnet
 1. Run `transaction-history-service`
 ```
 git clone https://github.com/gnosis/safe-transaction-service.git
-cd safe-transaction-history
+cd safe-transaction-service
 git checkout develop
 docker-compose build
 # it comes enabled by default in docker-compose
--- a/yarn.lock
+++ b/yarn.lock