summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2013-09-10 14:59:33 -0700
committerDon Kjer <don@lindenlab.com>2013-09-10 14:59:33 -0700
commit683c36ae2f81bd08d83d7e37c60f447196635834 (patch)
tree05c60ca16e66a297a9ec19f0dc64c3f7664edcf0 /doc
parent3a44c5c2a3e04ed8e7174bedb5753d29e6581019 (diff)
parente6a68e1f09e4d056b4932111e09c3bff98acf29d (diff)
Automated merge
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