summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-10-04 15:36:52 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-10-04 15:36:52 -0400
commit6f5790da38b3005292d3dbeaad778ea740110e33 (patch)
treeb28ce7a7a158f72f4dbfda60bafff2317c671837 /doc
parent56e2f11417183d8dcc3d681f79fc63446b236abb (diff)
parentf7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff)
Merge. Pull in viewer-release after 3.6.7 release.
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