summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-06 13:01:12 -0500
committerOz Linden <oz@lindenlab.com>2014-03-06 13:01:12 -0500
commit43eae437980226d62898c5f6fdb2a068f3b3c49b (patch)
tree64912b2398a34b9474e481d2d26f1afb124e7351 /doc
parent9185f1e25602bb9bc4c2bf7923f2743effa281fa (diff)
parenta0f668c0a382ad4bd7a9be703bbcf1edd2bcf460 (diff)
merge changes for storm-68
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 2105c16a16..f765c3ac00 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -665,6 +665,7 @@ Jonathan Yap
STORM-1809
STORM-1793
STORM-1810
+ STORM-68
STORM-1838
STORM-1892
STORM-1894