diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-12-12 16:53:03 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-12-12 16:53:03 -0300 |
| commit | 0d3b52cde94b9297d614ded74e84e57e6ee0e53d (patch) | |
| tree | 6e05d08fc8a8e2754842edc092844a62e44f4e53 | |
| parent | 4abb410b1be39e34e86030803908b69b22090c53 (diff) | |
Fold in changes.
| -rw-r--r-- | CHANGELOG.rst | 5 | ||||
| -rw-r--r-- | changes/feature-6518_pin-calyx-provider | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2cf96d8d..82b86918 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,8 +6,8 @@ History 2014 ==== -0.7.0rc5 November 14 -- the "One window to rule them all, and in the darkness bind them." release: -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +0.7.0 December 12 -- the "One window to rule them all, and in the darkness bind them." release: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - Select current provider on EIP preferences. Closes #5815. - Handle logout correctly when we stop_services to launch the @@ -38,6 +38,7 @@ History - Remove instructions/references of mail from the client. Closes #6140. - Add support for the internal LXDE polkit agent. Closes #6043. - Allow the server to set a custom --fragment openvpn option (#5933) +- Add Calyx.net as pinned provider. Closes #6518. 0.6.1 August 15 -- the "knock knock knocking on beta's door" release: +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/changes/feature-6518_pin-calyx-provider b/changes/feature-6518_pin-calyx-provider deleted file mode 100644 index 9d204d00..00000000 --- a/changes/feature-6518_pin-calyx-provider +++ /dev/null @@ -1 +0,0 @@ - - Add Calyx.net as pinned provider. Closes #6518. |