diff options
| author | Hans Nilsson <[email protected]> | 2016-10-11 13:11:34 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-10-11 13:11:34 +0200 |
| commit | f78d43150da32fb88b9739abd52d62e5e70e02b0 (patch) | |
| tree | 5413f0b9346fd7cca4bc5466c9fa4b6082af1190 /OTP_VERSION | |
| parent | 6eefded08574c68e869340e7760d635f37af26a3 (diff) | |
| parent | 307f2a54f512364ea19842a3def29469b640563d (diff) | |
| download | otp-f78d43150da32fb88b9739abd52d62e5e70e02b0.tar.gz otp-f78d43150da32fb88b9739abd52d62e5e70e02b0.tar.bz2 otp-f78d43150da32fb88b9739abd52d62e5e70e02b0.zip | |
Merge branch 'maint'
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 d715c6e9f0..fd8506a1c6 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1,2 +1 @@ 20.0-rc0 - |