diff options
| author | Henrik Nord <[email protected]> | 2015-10-14 12:42:02 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-10-14 12:42:02 +0200 |
| commit | 930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9 (patch) | |
| tree | 0917e3e56e3e24a5a45bd1afb61c6ea69ec0be2d /OTP_VERSION | |
| parent | 3c787f47ffc660d77eba3528b10eba570529fb9e (diff) | |
| parent | 3c799a7ee5ee26f643c7ffad79c81d6156f3dac6 (diff) | |
| download | otp-930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9.tar.gz otp-930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9.tar.bz2 otp-930a0cb98e8a3cc08c70d93472b35d9fdb1dd2f9.zip | |
Merge branch 'maint-18' into maint
Conflicts:
lib/ssh/vsn.mk
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 e8b3857904..4fa4aa5e79 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -18.1.1 +18.1.2 |