summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-01-03 12:14:03 -0500
committerOz Linden <oz@lindenlab.com>2014-01-03 12:14:03 -0500
commit30f0d61510a2f7d28bd24d2165807e7e6ced4e55 (patch)
treed1640aaa6cd78e33bfe52defdeba5eb807459885 /doc
parent5f635f7942130ab25f74f5c6aaeb5b135d0cb43e (diff)
parent1a9b9f1bd1b5f64b35b9ce6eff458cdb7a79fe6e (diff)
merge changes for 3.6.12-release
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index c50c57feea..acc14db416 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1185,6 +1185,7 @@ TankMaster Finesmith
STORM-1258
STORM-1602
STORM-1868
+ STORM-1950
VWR-26622
VWR-29224
Talamasca