diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-01-30 14:32:10 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-01-30 14:32:10 -0800 |
| commit | 0a90bef4f47b4b29e119d78d7293184856bad605 (patch) | |
| tree | bf51171bdde2a8362937e952abfb5a69764b4658 | |
| parent | 397cd4ce991b0d72b7f505401b58085cce7cbb05 (diff) | |
| parent | 4aa966865393d52ab548ca4b3b12e84260d82f8d (diff) | |
Merge branch '1.10' into 1.11
Conflicts:
sites/www/changelog.rst
| -rw-r--r-- | sites/www/changelog.rst | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 6e5f6188..bd6dfcfd 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,8 +2,6 @@ Changelog ========= -* :release:`1.11.4 <2014-01-21>` 193 -* :release:`1.10.6 <2014-01-21>` 193 * :bug:`193` (and its attentant PRs :issue:`230` & :issue:`253`): Fix SSH agent problems present on Windows. Thanks to David Hobbs for initial report and to Aarni Koskela & Olle Lundberg for the patches. |