Permalink
Browse files

Merge branch '1.3' into 1.4

Conflicts:
	docs/changelog.rst
	fabric/version.py
  • Loading branch information...
2 parents 62ff8e1 + 5b50a16 commit ba53b6ed3beb03e965302103dc57651fb6715ebd @bitprophet bitprophet committed Apr 5, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 docs/changelog.rst
View
@@ -25,6 +25,7 @@ would have also been included in the 1.2 line.
Changelog
=========
+* :release:`1.3.6 <2012-04-04>`
* :bug:`608` Add ``capture`` kwarg to `~fabric.contrib.project.rsync_project`
to aid in debugging rsync problems.
* :bug:`607` Allow `~fabric.operations.local` to display stdout/stderr when it

0 comments on commit ba53b6e

Please sign in to comment.