summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-10-28 16:47:24 -0400
committerOz Linden <oz@lindenlab.com>2011-10-28 16:47:24 -0400
commitf49f6c8ef27bb73179f12d82401026ec2bb49155 (patch)
tree665a08d88dd7796aaf7b0d5a25847c8c257a1e5d /doc
parent749fbe7d514fcab82a8bb3f16ce793dccedbd542 (diff)
parent4fd9a53115bf85ffe17974323d5fa609e0df960c (diff)
merge changes for storm-959
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 988410701b..d719f64baf 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -480,6 +480,7 @@ Ima Mechanique
OPEN-50
OPEN-61
OPEN-76
+ STORM-959
STORM-1175
Imnotgoing Sideways
Inma Rau
@@ -654,6 +655,8 @@ Lilly Zenovka
Lizzy Macarthur
Luban Yiyuan
Luc Starsider
+Luminous Luminos
+ STORM-959
Lunita Savira
Maccus McCullough
maciek marksman