Merge pull request #518 from benjaminbollen/release-0.16

Resolve merge conflicts with master on release-0.16

Merge pull request #518 from benjaminbollen/release-0.16
Resolve merge conflicts with master on release-0.16
70411063 · Benjamin Bollen · GitHub · 04bf1169 · 736d5c6b · 70411063
Commit 70411063 authored 8 years ago by Benjamin Bollen Committed by GitHub 8 years ago
--- a/circle.yml
+++ b/circle.yml
@@ -84,3 +84,6 @@ deployment:
      - docker push quay.io/eris/db
      # push the updated documentation
      - docs/build.sh
+
+
+