summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-18 14:01:18 -0400
committerOz Linden <oz@lindenlab.com>2012-06-18 14:01:18 -0400
commitdad85ce55440e9c2328a4dd7362ac35c0e277b9e (patch)
treef97010e54bbf63be0876ae89a5b1ebc3df614adb /doc
parentbbf8137ce5b9e53ca8be2aea5c553bff8699b4a7 (diff)
parent242fe546ade3f7f2eeeb9b7b2ab7d744ac6ce9a9 (diff)
merge changes for storm-1868
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 20b0bff07e..90a9e8ef49 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1096,8 +1096,9 @@ Synystyr Texan
Takeda Terrawyng
TankMaster Finesmith
STORM-1100
- STORM-1602
STORM-1258
+ STORM-1602
+ STORM-1868
VWR-26622
Talamasca
Tali Rosca