summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-02-27 09:03:04 -0500
committerOz Linden <oz@lindenlab.com>2015-02-27 09:03:04 -0500
commit83851db09ab0fecbb6722826055a55844fd98ea6 (patch)
treeb3c73b1dec463e4d8a8a315f1d713a83e119d99b /doc
parentbdb42b4c716a374ab7a7b54a630ed5b5a481cdb2 (diff)
parentd4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff)
merge up to 3.7.25-release
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 6e3dd70cb8..53109fdfbf 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -358,6 +358,7 @@ Decro Schmooz
Denim Kamachi
DiJodi Dubratt
Dil Spitz
+ MAINT-4455
Dimitrio Lewis
Dirk
Draconis Neurocam
@@ -1233,6 +1234,7 @@ Sovereign Engineer
STORM-1972
OPEN-195
OPEN-217
+ OPEN-295
SpacedOut Frye
VWR-34
VWR-45
@@ -1274,6 +1276,7 @@ TankMaster Finesmith
OPEN-140
OPEN-142
OPEN-154
+ OPEN-295
STORM-1100
STORM-1258
STORM-1602