summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-01 13:27:02 -0400
committerOz Linden <oz@lindenlab.com>2012-05-01 13:27:02 -0400
commit0248aa5ec26897cfbb631e87ea1044848ce196b6 (patch)
tree2ab481e37c18e0d2fb44349ebf6d1ccfa03ac780 /doc
parent5d92c60a4a4707eb18d9932afd01b196792830a2 (diff)
parent9df3afc1efd92c5c080703f5d1dc858dbeafea1c (diff)
merge changes for storm-1839
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 5c2d024af7..3054c5ce14 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -621,6 +621,7 @@ Jonathan Yap
STORM-1799
STORM-1796
STORM-1807
+ STORM-1839
STORM-1842
STORM-1808
STORM-1809