aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-11-28 14:58:05 +0100
committerLukas Larsson <[email protected]>2013-11-28 14:58:05 +0100
commit8bc2bac6b60724c2b454bf572ab13146a7154b2f (patch)
tree41ca4713d014a69d79b5643c2f4f744271172628 /erts
parenta30d07c660b3d2269484fcafb493daf670a21a72 (diff)
parent7914f4c8e64a3b9a4fdf94aa65150705b7da08b7 (diff)
downloadotp-8bc2bac6b60724c2b454bf572ab13146a7154b2f.tar.gz
otp-8bc2bac6b60724c2b454bf572ab13146a7154b2f.tar.bz2
otp-8bc2bac6b60724c2b454bf572ab13146a7154b2f.zip
Merge branch 'maint'
* maint: Revert "Merge branch 'fredrik/doc/syntax_highlight/OTP-11237' into maint"
Diffstat (limited to 'erts')
0 files changed, 0 insertions, 0 deletions