aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-01-26 10:32:01 +0100
committerLukas Larsson <[email protected]>2016-01-26 10:32:01 +0100
commit42d798aef0f435d0027c836949a26cc699e7e9ae (patch)
treea3a6183ba5717aa8fb56b6cfd5d588934ef6e77a /.gitattributes
parent448978562afbf77202034b018bf56775212f1ae6 (diff)
parentf4f0d3641264b75f2d4c465ed93e2d06e0961e4c (diff)
downloadotp-42d798aef0f435d0027c836949a26cc699e7e9ae.tar.gz
otp-42d798aef0f435d0027c836949a26cc699e7e9ae.tar.bz2
otp-42d798aef0f435d0027c836949a26cc699e7e9ae.zip
Merge branch 'lukas/erl_docget/maps_anno_tags/OTP-12955' into maint
* lukas/erl_docget/maps_anno_tags/OTP-12955: erl_docgen: Fix spec anno's for maps
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions