projects / cached-property.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc594b1 ca0796e)
Merge branch 'master' into pyup-update-wheel-0.30.0-to-0.31.1 pyup-update-wheel-0.30.0-to-0.31.1
authorDaniel Roy Greenfeld <pydanny@users.noreply.github.com>
Thu, 14 Jun 2018 16:29:45 +0000 (09:29 -0700)
committerGitHub <noreply@github.com>
Thu, 14 Jun 2018 16:29:45 +0000 (09:29 -0700)

Trivial merge