summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-20 10:37:10 -0400
committerOz Linden <oz@lindenlab.com>2013-08-20 10:37:10 -0400
commitc42a91421ff4691e6d2efa5744fe3f246510649c (patch)
tree0ce60a84e78b802c7f936e3b4cb1503edb2fa945 /doc
parentd2b947c1fa0757e94eb74429a339a8198531dd93 (diff)
parent171089207b528ab80a954292c127ba77254ee927 (diff)
merge changes for 3.6.3-release
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 6337691657..26da3ad58c 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -176,6 +176,7 @@ Ansariel Hiller
STORM-1713
STORM-1899
STORM-1932
+ MAINT-2368
Aralara Rajal
Ardy Lay
STORM-859
@@ -483,6 +484,7 @@ Hiro Sommambulist
Hitomi Tiponi
STORM-1741
STORM-1862
+ BUG-1067
Holger Gilruth
Horatio Freund
Hoze Menges