summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorThomas Nelson <rider@lindenlab.com>2017-10-17 13:38:39 -0700
committerThomas Nelson <rider@lindenlab.com>2017-10-17 13:38:39 -0700
commit5754493cdcfeac76d0576abc19bdf5a03717780d (patch)
treee6db53ae1cd654f9b2a1a6b9ab47e01ea738ecef /doc
parentcc22ffc6d799544e8f2a9dfed6813081d908c88d (diff)
parent9c5becd67d7e6fe5f696dcae8690dd562b7b0449 (diff)
Merged lindenlab/viewer64 into default
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index f14769610f..0b6fcc1626 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1040,9 +1040,9 @@ Nicholaz Beresford
VWR-2682
VWR-2684
Nick Rhodes
-NickyD
- MAINT-873
Nicky Dasmijn
+ MAINT-873
+ MAINT-7541
VWR-29228
MAINT-1392
MAINT-873