summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-30 06:40:46 -0400
committerOz Linden <oz@lindenlab.com>2011-06-30 06:40:46 -0400
commitf07173a9689237bf2d8218600c15d6bf4d047cdc (patch)
treec7f60ff35ab49de9717c29537858e770a12711ac /doc
parentb278b61f4e3761605745af83c5003437058ca161 (diff)
parent77bffdcec7a5fd9986ab8490656666746f18ea1b (diff)
merge changes for storm-1452
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 87fb45d8c8..67e78e87ee 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -452,6 +452,7 @@ Jonathan Yap
STORM-899
STORM-1273
STORM-457
+ STORM-1452
STORM-1406
STORM-1327
STORM-1396
@@ -791,6 +792,7 @@ Strife Onizuka
SNOW-691
TankMaster Finesmith
STORM-1100
+ STORM-1452
Tayra Dagostino
SNOW-517
SNOW-543