Skip to content
Browse files

Merge branch '1.0' into 1.1

Conflicts:
	docs/changelog.rst
	fabric/version.py
  • Loading branch information...
2 parents 93003a7 + 1b2a0fc commit 9eba4aa3d02bccd050db1cc5cd3674c951918ad9 @bitprophet bitprophet committed
Showing with 1 addition and 0 deletions.
  1. +1 −0 docs/changelog.rst
View
1 docs/changelog.rst
@@ -25,6 +25,7 @@ would have also been included in the 1.2 line.
Changelog
=========
+* :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.

0 comments on commit 9eba4aa

Please sign in to comment.
Something went wrong with that request. Please try again.