summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-10-04 09:19:25 -0700
committerdolphin <dolphin@lindenlab.com>2013-10-04 09:19:25 -0700
commitc2c060d4401d3a79a9ae0076af0c9b86d14f7f37 (patch)
treeb7efcf3c2e38aa9de488342b3379b4bde0a6bc47 /doc
parentd44c85c6dc575c0c67019ce1bffecfaa5bc275d1 (diff)
parentf7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff)
Merge with 3.6.7
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 0035d4f597..931211f622 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -924,8 +924,11 @@ Nicky Dasmijn
MAINT-873
SUN-72
BUG-2432
+ STORM-1935
+ STORM-1936
BUG-3605
CHUIBUG-197
+ STORM-1937
Nicky Perian
OPEN-1
STORM-1087