summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-06-20 12:10:26 -0500
committerDave Parks <davep@lindenlab.com>2013-06-20 12:10:26 -0500
commit9ea2d90a0dd9ca9ab76583187354533011ef3fcb (patch)
tree93be8f1dd703cd87083cf871c1948671e0a8cb97 /doc
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
parentf62d04d4256e3ebb7ecf64ea370099c8795e8581 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-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 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