summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-09-09 14:51:34 -0400
committerOz Linden <oz@lindenlab.com>2013-09-09 14:51:34 -0400
commitc4b070ae0011a0c2aa8dd3d01c5f3ad3ecbd3ec3 (patch)
treed9da12a63dad133b557ff14972844e21dee8dc34 /doc/contributions.txt
parent8dc273b942ca3bae7469dcbaf7bab171b889eea1 (diff)
parent55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff)
merge changes for 3.6.5-release
Diffstat (limited to 'doc/contributions.txt')
-rwxr-xr-xdoc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index b2df058614..9f77bbc846 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -689,6 +689,8 @@ Kaimen Takahe
Katharine Berry
STORM-1900
OPEN-149
+ STORM-1940
+ STORM-1941
Keklily Longfall
Ken Lavender
Ken March