summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-21 10:40:57 -0400
committerOz Linden <oz@lindenlab.com>2013-08-21 10:40:57 -0400
commitc15d2e87acdfbaea8d144e7c22d2d3f29f3e3a66 (patch)
treeb1d966ee62e40029820ae034bf056d02c9fbbd29 /doc
parentc42a91421ff4691e6d2efa5744fe3f246510649c (diff)
parent00cd82e3e56554175a4fe2faffd129bbe669185d (diff)
merge changes for storm-1952
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 26da3ad58c..64e861aa94 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -305,6 +305,7 @@ Cinder Roxley
OPEN-185
STORM-1703
STORM-1958
+ STORM-1952
STORM-1951
Clara Young
Coaldust Numbers