summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-15 11:58:01 -0400
committerOz Linden <oz@lindenlab.com>2011-06-15 11:58:01 -0400
commit26e1f92c831c35ca0761c385d0540331d26f9a50 (patch)
tree7701123a8288e122af6956eb06ea6da4ed1d3446 /doc
parent81afbd5b293e80248daddb51e7985e474abe9d45 (diff)
parentcc7a041bfe908faa1a256d13d35cb1ad17358f60 (diff)
merge changes for storm-1313
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 d33c448416..397311373e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -443,6 +443,7 @@ Jonathan Yap
STORM-1236
STORM-1259
STORM-787
+ STORM-1313
STORM-899
STORM-1273
Kage Pixel