summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-01-07 11:39:06 -0500
committerOz Linden <oz@lindenlab.com>2014-01-07 11:39:06 -0500
commit69c32b04cfd52c6fbd34997fa6485a84435743ef (patch)
tree9e95073f5d7109b86ed5fdb06b26dae4416c7146 /doc
parentdc2af90b04a16a41851874b9ab55b4ac61af2d7b (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 da94c05db4..c77e408e79 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1192,6 +1192,7 @@ TankMaster Finesmith
STORM-1258
STORM-1602
STORM-1868
+ STORM-1950
VWR-26622
VWR-29224
Talamasca