summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-08-24 13:55:28 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-08-24 13:55:28 -0400
commitca0f80c9dec990233468404d994227bdbea93790 (patch)
treee2b03a81886912b0975d70ea21caefa628ac50ab /doc
parentb59a443254ef11def158ffb46dbbb3d4d3dada4a (diff)
parente51a57b895895e3a3a613022b973067fd17d9561 (diff)
merge
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3218624f76..e20b7b83c5 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -401,6 +401,7 @@ Gaberoonie Zanzibar
Ganymedes Costagravas
Geenz Spad
STORM-1823
+ STORM-1900
Gene Frostbite
GeneJ Composer
Geneko Nemeth
@@ -657,6 +658,8 @@ Kage Pixel
VWR-11
Kagehi Kohn
Kaimen Takahe
+Katharine Berry
+ STORM-1900
Keklily Longfall
Ken Lavender
Ken March