Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '1.1' into 1.2

Conflicts:
	fabric/version.py
  • Loading branch information...
commit 26f121f6c8f1826c83396e9128b6fbec3e9e4812 2 parents e0e3f61 + bfde820
@bitprophet bitprophet authored
Showing with 2 additions and 0 deletions.
  1. +2 −0  docs/changelog.rst
View
2  docs/changelog.rst
@@ -25,6 +25,8 @@ would have also been included in the 1.2 line.
Changelog
=========
+* :release:`1.1.5 <2011-10-23>`
+* :release:`1.0.5 <2011-10-23>`
* :bug:`323` `~fabric.operations.put` forgot how to expand leading tildes in
the remote file path. This has been corrected. Thanks to Piet Delport for the
catch.
Please sign in to comment.
Something went wrong with that request. Please try again.