summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJJ Linden <jj@lindenlab.com>2013-10-10 16:44:22 -0700
committerJJ Linden <jj@lindenlab.com>2013-10-10 16:44:22 -0700
commitdc431ea6d2e4e13ab505b8118d6f9220630efe96 (patch)
tree8c37de1ca61cf29e3d1863ce08d34acff666e9ab /doc
parent3aea5a5a6ab0e6d96fe581a9bab9896956129ba3 (diff)
parentf7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff)
merged in recent changes
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