aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-05-29 12:40:17 +0200
committerErlang/OTP <[email protected]>2015-05-29 12:40:17 +0200
commit35ca4282c5bd8a91f80397d0b5c53b661811a374 (patch)
treeaae8899a8b1a555f2c7ac197a2904094497fbe40 /.gitattributes
parentd55c8c8d6e56849bab20797bf35bd5dc69cfcd07 (diff)
parentf99b944f5d6faf3e8c56c10e3e81668bb44160e0 (diff)
downloadotp-35ca4282c5bd8a91f80397d0b5c53b661811a374.tar.gz
otp-35ca4282c5bd8a91f80397d0b5c53b661811a374.tar.bz2
otp-35ca4282c5bd8a91f80397d0b5c53b661811a374.zip
Merge branch 'anders/diameter/sctp/OTP-12744' into maint-17
* anders/diameter/sctp/OTP-12744: Fix diameter_sctp listener race Tweak transport suite failures Run traffic suite over SCTP
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions