diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-03-16 10:45:00 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-03-16 10:45:00 +0100 |
| commit | bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee (patch) | |
| tree | e7da8f2ba00ee881a540845d6e98f042a9454400 /OTP_VERSION | |
| parent | 845dd68493a91decc32d50cc785e6afaf9dfb6c3 (diff) | |
| parent | 0f2ead7bedeedc852db2deeeaa0e9e096bba8c0f (diff) | |
| download | otp-bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee.tar.gz otp-bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee.tar.bz2 otp-bdbb5f0376678c0aae289b3f9264a2bd4d9b96ee.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
ssl: Prepare for release
ssl: Remove duplicate release note
ssl: Fix filter function to not discard AEAD cipher suites
Conflicts:
OTP_VERSION
Diffstat (limited to 'OTP_VERSION')
| -rw-r--r-- | OTP_VERSION | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OTP_VERSION b/OTP_VERSION index a56f451a4e..06d4ac2bfd 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1,2 +1 @@ 21.0-rc0 - |