summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-19 15:14:23 -0400
committerOz Linden <oz@lindenlab.com>2013-08-19 15:14:23 -0400
commit731fe3e7c6287c63134c1a08572f9d97a0eb0ff0 (patch)
tree142060ca39c7e495d05edf7e0359a15716840705 /doc
parent53eff025bc205e3127da4dc0c3df3cb406eb1153 (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 ebd8e54fe8..9198c11fa3 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
Arare Chantilly
CHUIBUG-191
@@ -481,6 +482,7 @@ Hiro Sommambulist
Hitomi Tiponi
STORM-1741
STORM-1862
+ BUG-1067
Holger Gilruth
Horatio Freund
Hoze Menges