summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-09-09 12:46:20 -0700
committerdolphin <dolphin@lindenlab.com>2013-09-09 12:46:20 -0700
commit07cb32449f601e2d47e83d781af3bb9df2474d5c (patch)
treea913755d041e5ac780c840301ec4676894497e82 /doc
parent51c01f5294b68b66706685346ecea16246b85cce (diff)
parent55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff)
Merge with 3.6.5
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index a6d522de2f..0035d4f597 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -679,6 +679,8 @@ Kagehi Kohn
Kaimen Takahe
Katharine Berry
STORM-1900
+ STORM-1940
+ STORM-1941
Keklily Longfall
Ken Lavender
Ken March