Skip to content
Browse files

Merge branch '1.2' into 1.3

Conflicts:
	fabric/version.py
  • Loading branch information...
2 parents 90978ca + 1820709 commit e70825dae7425d50d5acfdd5964c521f982a8941 @bitprophet bitprophet committed Nov 7, 2011
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.2.4 <2011-11-07>`
+* :release:`1.1.6 <2011-11-07>`
* :support:`459` Update our `setup.py` files to note that PyCrypto released
2.4.1, which fixes the setuptools problems.
* :support:`467` (also :issue:`468`, :issue:`469`) Handful of documentation

0 comments on commit e70825d

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