summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-25 13:24:48 -0400
committerOz Linden <oz@lindenlab.com>2011-08-25 13:24:48 -0400
commitf603d143392caf8cfd610d567df0c3fbffeecaa4 (patch)
tree34fea28d0f2052670d1341ff4a6acc69ddf774a0 /doc
parente6239b7978fb9f05d2c8c7cf42b9277f4a5f7c52 (diff)
parentcce5dd64e09eb2f0da039c3e6c4c1ebd7b5aafeb (diff)
merge changes for storm-1276
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 0368cd1ff0..55a3aaf1f4 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -563,6 +563,7 @@ Jonathan Yap
STORM-1313
STORM-899
STORM-1273
+ STORM-1276
STORM-1462
STORM-1459
Kadah Coba