aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-11-23 17:07:08 +0100
committerIngela Anderton Andin <[email protected]>2017-11-23 17:07:08 +0100
commit6a51514556328dcc56de8f2b75eae01b18b96637 (patch)
treee22dac4c9e289a29646838b1406d144d915ea31a /README.md
parent754afa1d10e32d2e50d0a8b5ddf316037ba9d6fc (diff)
parenta453532fe31eecd8c39b5035702ee20b402fd687 (diff)
downloadotp-6a51514556328dcc56de8f2b75eae01b18b96637.tar.gz
otp-6a51514556328dcc56de8f2b75eae01b18b96637.tar.bz2
otp-6a51514556328dcc56de8f2b75eae01b18b96637.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions