summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-29 21:21:36 -0400
committerOz Linden <oz@lindenlab.com>2011-06-29 21:21:36 -0400
commitf6ddd71214a284ffcc96c1bd7d3964ec7378e84a (patch)
treefb404185928ca6b18c601961d3d06d67887fd624 /doc
parentb5001ff819f789e51929d4fe29db7fc05ddd4468 (diff)
parentb91205ccf041df02323519bfdf86784a13d05748 (diff)
merge changes for storm-1392
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 729c73f777..59147d69a4 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -450,6 +450,7 @@ Jonathan Yap
STORM-899
STORM-1273
STORM-1292
+ STORM-1392
STORM-1302
STORM-1326
Kage Pixel