summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-03-11 16:22:44 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-03-11 16:22:44 -0700
commit317476de8f33388e60348138f0f440f3949639d1 (patch)
treec5d065a3565dbf4d2a43b98613b8d71e26cc373f /doc
parent6b067125a0d338c3acc6fd1c786620e474a80aa8 (diff)
parente5aa9088f01f8689e19be82e3caa56fffbab85c1 (diff)
merge
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