aboutsummaryrefslogtreecommitdiffstats
path: root/EPLICENCE
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2015-03-17 12:36:03 +0100
committerRickard Green <[email protected]>2015-03-17 12:36:03 +0100
commitf991b0bb0ce200967f73b4d6505956a56e358b21 (patch)
treeb4e4334aad4a493155e8a7444d465a7eb24ea3eb /EPLICENCE
parent281892c5d7b7b5e1ac2402390d83287913aefd94 (diff)
parent39cdf58cbf7de695917204763a0cd7b52606fb5e (diff)
downloadotp-f991b0bb0ce200967f73b4d6505956a56e358b21.tar.gz
otp-f991b0bb0ce200967f73b4d6505956a56e358b21.tar.bz2
otp-f991b0bb0ce200967f73b4d6505956a56e358b21.zip
Merge branch 'maint'
* maint: Minor fixes Conflicts: system/doc/system_principles/versions.xml
Diffstat (limited to 'EPLICENCE')
0 files changed, 0 insertions, 0 deletions