summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-01-08 13:40:59 -0600
committerDave Parks <davep@lindenlab.com>2013-01-08 13:40:59 -0600
commit954ebaed84f934437fc3a18c937f08fc527359e3 (patch)
tree93f6d2c12a93045db66337bdb17167f0b312b785 /doc
parent716e2ea3b1e25ac8da64343d02310e8f086c48e7 (diff)
parentb601bc3cbf5e999b4fd0b0b9ae024397b92cce39 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 478f526b9c..10d6818bd3 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -891,6 +891,8 @@ Nicholaz Beresford
VWR-2682
VWR-2684
Nick Rhodes
+NickyD
+ MAINT-873
Nicky Dasmijn
VWR-29228
MAINT-873