diff options
author | Erland Schönbeck <[email protected]> | 2014-07-11 11:09:09 +0200 |
---|---|---|
committer | Erland Schönbeck <[email protected]> | 2014-07-11 11:09:09 +0200 |
commit | 9a1419a7d4325085dc2235a8531d77e1d96ea689 (patch) | |
tree | ebb7ed16ce92c1c99b44091bee9e4d2a7220ef75 /OTP_VERSION | |
parent | a56f6e3e716c4a2c8f16933e1e30759381c4fdb8 (diff) | |
parent | 934b6de4d2ab6c31c5217e1ba4779ade9e37cc83 (diff) | |
download | otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.tar.gz otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.tar.bz2 otp-9a1419a7d4325085dc2235a8531d77e1d96ea689.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 6f9c209b3b..59a75133a2 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -17.1.1 +17.1.2 |