summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-11-20 17:03:55 -0600
committerDave Parks <davep@lindenlab.com>2012-11-20 17:03:55 -0600
commit5d34ac552f3939626840b703b2da380663f25f49 (patch)
treeddeacd3365fed0ad193c053d39ebeb39451cc74a /doc
parenta830812172d7eb163c06ead3155dc4b43ded4346 (diff)
parent8db983fb8095f25873b8317fd1f4764abce4a31b (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index f18985adcd..478f526b9c 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
@@ -892,6 +893,7 @@ Nicholaz Beresford
Nick Rhodes
Nicky Dasmijn
VWR-29228
+ MAINT-873
Nicky Perian
OPEN-1
STORM-1087
@@ -1059,9 +1061,12 @@ Shawn Kaufmat
SNOW-240
Sheet Spotter
Shnurui Troughton
+Shyotl Kuhr
+ MAINT-1138
Siana Gearz
STORM-960
STORM-1088
+ MAINT-1138
sicarius Thorne
Sicarius Toxx
SignpostMarv Martin
@@ -1243,6 +1248,7 @@ Westley Streeter
Whimsy Winx
Whirly Fizzle
STORM-1895
+ MAINT-873
Whoops Babii
VWR-631
VWR-1640