summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-10 10:56:40 -0400
committerOz Linden <oz@lindenlab.com>2013-05-10 10:56:40 -0400
commit4d22c32aa9ac42b4a720200386d68339e8656974 (patch)
treec84419f0f3ac44d2f64b7082c3c69c1fbec919d2 /doc/contributions.txt
parent73e6711268adb93025386ffb766055125f0d849e (diff)
parent33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff)
merge changes for 3.5.2-beta4
Diffstat (limited to 'doc/contributions.txt')
-rwxr-xr-x[-rw-r--r--]doc/contributions.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 33cf0a422e..26fbfe2bb0 100644..100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1070,10 +1070,12 @@ Sheet Spotter
Shnurui Troughton
Shyotl Kuhr
MAINT-1138
+ MAINT-2334
Siana Gearz
STORM-960
STORM-1088
MAINT-1138
+ MAINT-2334
sicarius Thorne
Sicarius Toxx
SignpostMarv Martin
@@ -1091,6 +1093,8 @@ SLB Wirefly
Slee Mayo
SEC-1075
snowy Sidran
+Sovereign Engineer
+ MAINT-2334
SpacedOut Frye
VWR-34
VWR-45
@@ -1345,3 +1349,4 @@ Zoex Flanagan
+