summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-30 14:09:35 -0400
committerOz Linden <oz@lindenlab.com>2012-05-30 14:09:35 -0400
commitdd0c04b8648a2cf36a94fa678fad0f55d631d0fc (patch)
tree407a599c94044a7add03d8c6662e0209b9ebff62 /doc
parentdbac37dcb50bf44255c2b622d418bb4339f1afca (diff)
parentdd5d7fadca40b43a597b1af14d94273286498ab8 (diff)
merge changes for storm-1860
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 5b07ebe7dc..02ea582a4a 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -632,6 +632,7 @@ Jonathan Yap
STORM-1809
STORM-1793
STORM-1810
+ STORM-1860
Kadah Coba
STORM-1060
Jondan Lundquist