summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-29 12:54:52 -0400
committerOz Linden <oz@lindenlab.com>2013-08-29 12:54:52 -0400
commitf3043428b02d5f8874551e03dfc9bd1109be3494 (patch)
treec07deeaceb57899dffe9233863be55b540699f36 /doc
parent3364614f8b3c61a369760b4effc2ed9382be75f9 (diff)
parentf3025b0ae4a2ff714cca68f69d0aa06aed925c1f (diff)
merge changes for storm-1933
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 848a5d7574..7719670861 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -176,6 +176,7 @@ Ansariel Hiller
STORM-1713
STORM-1899
STORM-1932
+ STORM-1933
MAINT-2368
STORM-1931
MAINT-2773