summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-19 15:51:40 -0400
committerOz Linden <oz@lindenlab.com>2013-08-19 15:51:40 -0400
commit70cacc4d17790f13d62188a49d814f94da9301d5 (patch)
tree2da7d156c9529c74b66bfb0fd9c4ec064a6f5e35 /doc
parent561e0bb1a09e613e6fb41f6a31f1b182b9caa19c (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 0d5dbca759..d5c8e35af4 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -175,6 +175,7 @@ Ansariel Hiller
STORM-1685
STORM-1713
STORM-1899
+ MAINT-2368
Aralara Rajal
Ardy Lay
STORM-859
@@ -479,6 +480,7 @@ Hiro Sommambulist
Hitomi Tiponi
STORM-1741
STORM-1862
+ BUG-1067
Holger Gilruth
Horatio Freund
Hoze Menges