summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-13 19:09:00 -0400
committerOz Linden <oz@lindenlab.com>2013-03-13 19:09:00 -0400
commitbf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (patch)
tree85a0f5fef2af8276cf99388a46193624838dfb6b /doc
parentd348deb7049cbaef7c228000525c7ee5a265464c (diff)
parent04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff)
merge changes for 3.5.0-beta3
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 10c935f9bb..32dd3c1a2e 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -744,6 +744,7 @@ Marc Claridge
Marc2 Sands
Marianne McCann
Marine Kelley
+ CHUIBUG-134
STORM-281
MartinRJ Fayray
STORM-1844