diff options
| author | Donald Stufft <donald@stufft.io> | 2015-01-28 17:43:14 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2015-01-28 17:43:14 -0500 |
| commit | b8752cfd24bb784eaaecc45fc465c37395cfdf49 (patch) | |
| tree | bedb27efd71528ca54c02a033e71779c9f4593e1 | |
| parent | c5e65ef56e9dfcf69d076e99b0d2063b6fb9c414 (diff) | |
| parent | b789e821e77b6e4f41ee777b5cc823c5d0676661 (diff) | |
| download | virtualenv-b8752cfd24bb784eaaecc45fc465c37395cfdf49.tar.gz | |
Merge branch 'master' into develop
Conflicts:
docs/changes.rst
virtualenv.py
| -rw-r--r-- | docs/changes.rst | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/changes.rst b/docs/changes.rst index 7aa0826..f0241a3 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -4,6 +4,13 @@ Release History 12.1.0 (unreleased) ~~~~~~~~~~~~~~~~~~~ +12.0.6 (2015-01-28) +~~~~~~~~~~~~~~~~~~~ + +* Upgrade pip to 6.0.7 + +* Upgrade setuptools to 12.0.5 + 12.0.5 (2015-01-03) ~~~~~~~~~~~~~~~~~~~ |