Merge remote-tracking branch 'upstream/development' into sol-doc

2018-09-25 16:34:44 -04:00
parent de9f5d350f b40861747b
commit d3edb9721c
106 changed files with 1005 additions and 436 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,7 +51,7 @@ jobs:
  test-contracts-geth:
    docker:
      - image: circleci/node:9
-      - image: albrow/0x-devnet
+      - image: 0xorg/devnet
    working_directory: ~/repo
    steps:
      - restore_cache:
@@ -64,7 +64,7 @@ jobs:
    resource_class: medium+
    docker:
      - image: circleci/node:9
-      - image: verdaccio/verdaccio
+      - image: 0xorg/verdaccio
    working_directory: ~/repo
    steps:
      - restore_cache: