aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-04-15 11:32:58 +0200
committerRickard Green <[email protected]>2019-04-15 11:32:58 +0200
commit22af152828a9b38aeab44d71300b4eca813964c9 (patch)
treebd4622f73085ae4ea2c4ed68c01b177fd84218e2 /lib/kernel/doc
parent452ba2756ef87974e44c283f6259ee535cbf7f4e (diff)
parent5d05cf5417b9f447a2de1cfaf705371c9ba64d50 (diff)
downloadotp-22af152828a9b38aeab44d71300b4eca813964c9.tar.gz
otp-22af152828a9b38aeab44d71300b4eca813964c9.tar.bz2
otp-22af152828a9b38aeab44d71300b4eca813964c9.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
Diffstat (limited to 'lib/kernel/doc')
0 files changed, 0 insertions, 0 deletions