aboutsummaryrefslogtreecommitdiffstats
path: root/lib/edoc
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-06-13 10:28:55 +0200
committerJohn Högberg <[email protected]>2019-06-13 10:28:55 +0200
commit8fb03c024165d6777f429e495af676dfe020e78a (patch)
treef536bfadf844d2dcd0c6bd14a361c0e09b1ca305 /lib/edoc
parent898b9b35f2cad1e925ea658d2dc381c5bde01829 (diff)
parentb4fb2e5669acb02697d9a9ab168eb0fbff6f370c (diff)
downloadotp-8fb03c024165d6777f429e495af676dfe020e78a.tar.gz
otp-8fb03c024165d6777f429e495af676dfe020e78a.tar.bz2
otp-8fb03c024165d6777f429e495af676dfe020e78a.zip
Merge branch 'maint-22' into maint
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
Diffstat (limited to 'lib/edoc')
0 files changed, 0 insertions, 0 deletions