summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-11-08 14:08:01 -0500
committerOz Linden <oz@lindenlab.com>2011-11-08 14:08:01 -0500
commit281fde3c4809fb6c6715617f4269299b4afc7edc (patch)
tree69900e42ddaaba00e1ce356e59c01f2dca72cc7a /doc
parentd3eb5ac875525a01bc14406912f3c537f8a5a4bd (diff)
parent8b0d63f343c4c77910c3d5e5516673bb9b76a35a (diff)
merge changes for storm-1105
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 c62af1d845..2b39e15e2a 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -582,6 +582,7 @@ Jonathan Yap
STORM-1639
STORM-910
STORM-1642
+ STORM-1105
STORM-1222
STORM-1659
STORM-1674