summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorsimon_linden <none@none>2013-09-09 16:17:16 -0700
committersimon_linden <none@none>2013-09-09 16:17:16 -0700
commite2019e8a3b5175eb6d7322fbe7c466f213854640 (patch)
tree1e2fbeaeb249e0f3f0f91e94af213c1840438581 /doc
parent6dd7e0c9ef587c6c05726d407bef8b51018a7a4b (diff)
parent2c1d89c57ec21e4790eb14066d2291282a1000b4 (diff)
Merge downstream code with 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 95137f5ebe..931211f622 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -679,6 +679,8 @@ Kagehi Kohn
Kaimen Takahe
Katharine Berry
STORM-1900
+ STORM-1940
+ STORM-1941
Keklily Longfall
Ken Lavender
Ken March