diff options
author | Magnus Lidén <[email protected]> | 2014-07-02 09:42:19 +0200 |
---|---|---|
committer | Magnus Lidén <[email protected]> | 2014-07-02 09:42:19 +0200 |
commit | fbc5f26d8f00277aca13fd97a0eef2423446c249 (patch) | |
tree | 2128e7a886d14c27f05bd63af068f875b6f839ef /OTP_VERSION | |
parent | d2ade9b27432a1f7342e231d0d8b12467c3d3d77 (diff) | |
parent | a7176f9186ffd7eb2b26daca2264d425383cf6a7 (diff) | |
download | otp-fbc5f26d8f00277aca13fd97a0eef2423446c249.tar.gz otp-fbc5f26d8f00277aca13fd97a0eef2423446c249.tar.bz2 otp-fbc5f26d8f00277aca13fd97a0eef2423446c249.zip |
Merge branch 'maint-17' into maint
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 641f83803e..6f9c209b3b 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -17.1 +17.1.1 |