summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-01-07 13:44:22 -0500
committerOz Linden <oz@lindenlab.com>2014-01-07 13:44:22 -0500
commita25bcb8523db08877c47fdbd834589ebbe45ff82 (patch)
treed0b6eb160a82aff8564522d88f4ead80704533c9 /doc
parent94ac0ffdc30842834bb8b0b6e229b21c7707c026 (diff)
parent24c5ac7417f8b32c39dd5defec21845bd03786c4 (diff)
merge changes for storm-1980
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e0d5d7423c..89390d9977 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -679,6 +679,7 @@ Jonathan Yap
STORM-1953
STORM-1957
STORM-1993
+ STORM-1980
OPEN-113
STORM-1975
STORM-1982