summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-10-20 20:13:47 -0700
committerMerov Linden <merov@lindenlab.com>2010-10-20 20:13:47 -0700
commit9652de51ce5a64136b66c04461b12005568bd5f1 (patch)
treee10b5fe356833b4027a55e8762efdbb605003c6e /doc
parenta0417239ab34e1671e8d77009305f45e19f6bed7 (diff)
parente44b548704d8dbdaea59ceaea08015499a2bf623 (diff)
STORM-281 : merge to viewer-development + fix indentation
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 c87df74a6b..16327d0917 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -384,6 +384,8 @@ Malwina Dollinger
CT-138
march Korda
SVC-1020
+Marine Kelley
+ STORM-281
Matthew Dowd
VWR-1344
VWR-1651