summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-10-17 15:33:20 -0500
committerDave Parks <davep@lindenlab.com>2012-10-17 15:33:20 -0500
commit2e30d652104859453e066e15431b59ee6f8bf182 (patch)
treea4f814247a3b1aa15b9739defa413e11bf480923 /doc
parent4d807ba638cea8898beed5ca8e7e1951adb962bb (diff)
parent378e9528d440470aab819be46392cec8b3a44563 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 43de729bff..d29d7ce464 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -321,6 +321,7 @@ Dale Glass
VWR-1358
VWR-2041
Darien Caldwell
+ SH-3055
Dartagan Shepherd
Debs Regent
Decro Schmooz
@@ -890,6 +891,8 @@ Nicholaz Beresford
VWR-2682
VWR-2684
Nick Rhodes
+NickyD
+ MAINT-873
Nicky Perian
OPEN-1
STORM-1087
@@ -1243,6 +1246,7 @@ Westley Streeter
Whimsy Winx
Whirly Fizzle
STORM-1895
+ MAINT-873
Whoops Babii
VWR-631
VWR-1640