summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-08-21 08:34:39 -0400
committerOz Linden <oz@lindenlab.com>2014-08-21 08:34:39 -0400
commitae60558141ccac3c2ca3371171015f42d50cb9cd (patch)
tree027aa585e060be12d32ddbeb34a3040ff634b29e /doc
parentd3c63401d26406093023e7cf4426ef4e29e138fd (diff)
parent0a134e749d01b711ca38a91044efb787cd815701 (diff)
merge changes for STORM-2060/STORM-2076
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 15b5766f53..2d27562e37 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1013,10 +1013,11 @@ NiranV Dean
STORM-2060
STORM-2061
STORM-2063
- STORM-2064
STORM-2065
STORM-2066
STORM-2068
+ STORM-2073
+ STORM-2076
BUG-372
BUG-1179
BUG-6835
@@ -1024,6 +1025,7 @@ NiranV Dean
BUG-6839
BUG-6840
BUG-6958
+ BUG-7020
Nounouch Hapmouche
VWR-238
Ollie Kubrick