summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2013-01-14 09:31:57 -0800
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2013-01-14 09:31:57 -0800
commit4de7c27d9343d866a313ca16f3f102e2750ddb89 (patch)
treea5a49491169f87a891a41e8916dcaa4e5c03302c /doc
parentdeb4dfbae5aa72c8e688f214f2e806b2345b93c5 (diff)
parentcb676675335791d9dacd032c389a0346c725d9d7 (diff)
Merge in viewer-development
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 8c4cb128c2..4f9af68e3b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -892,6 +892,8 @@ Nicholaz Beresford
VWR-2682
VWR-2684
Nick Rhodes
+NickyD
+ MAINT-873
Nicky Dasmijn
VWR-29228
MAINT-873