summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-08-19 17:17:20 -0700
committerdolphin <dolphin@lindenlab.com>2013-08-19 17:17:20 -0700
commit98628066eb27d4f2616479538ae20a07bf92cd98 (patch)
treee5c26ec684cabcbf51d6cc24c7230e5b8413eb10 /doc
parentb33354e1d19f8efafda8b41748c576227595bf5e (diff)
parent171089207b528ab80a954292c127ba77254ee927 (diff)
Merge
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 66ccb404a8..7712f16ade 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