From: Daniel Roy Greenfeld <pydanny@users.noreply.github.com>
Date: Sun, 8 Apr 2018 22:59:00 +0000 (-0500)
Subject: Merge branch 'master' into pyup-update-wheel-0.30.0-to-0.31.0
X-Git-Tag: 1.4.3~5^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=refs%2Fheads%2Fpyup-update-wheel-0.30.0-to-0.31.0;p=cached-property.git

Merge branch 'master' into pyup-update-wheel-0.30.0-to-0.31.0
---

8ffb998a0e8d859ff77dfde204f7272bbe41f59b
diff --cc requirements.txt
index 989a38b,42d8891..02b421c
--- a/requirements.txt
+++ b/requirements.txt
@@@ -3,4 -3,5 +3,5 @@@ coverage==4.4.
  pytest==3.5.0
  pytest-cov==2.5.1
  freezegun==0.3.10
+ twine==1.11.0
 -wheel==0.30.0
 +wheel==0.31.0