diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-02 12:33:28 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-02 12:33:28 +0100 |
| commit | 3f09864488e77655c9bcb5c70a9b4aead46b3a36 (patch) | |
| tree | 7ac112eae24b4b06cbf87f6a6e674558c89a2a8b /OTP_VERSION | |
| parent | 5cbb486b42790e7d6541bb511430dd164a351849 (diff) | |
| parent | 3e8c1ff94c0a73df71daadd4eb782c21c49f22d9 (diff) | |
| download | otp-3f09864488e77655c9bcb5c70a9b4aead46b3a36.tar.gz otp-3f09864488e77655c9bcb5c70a9b4aead46b3a36.tar.bz2 otp-3f09864488e77655c9bcb5c70a9b4aead46b3a36.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
inets: Prepare for release
inets: httpd - Fix broken handling of POST requests
inets: Make sure httpd:stop_service is synchronous
inets: httpd - do not hardcode 302 status for location
Diffstat (limited to 'OTP_VERSION')
| -rw-r--r-- | OTP_VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OTP_VERSION b/OTP_VERSION index 42ee6ac80e..286ad61f58 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -20.1.3 +20.1.4 |