summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-04 11:55:42 -0500
committerOz Linden <oz@lindenlab.com>2014-03-04 11:55:42 -0500
commitef794e7ffcfbf672e7115fc91f45f0e8340fdad5 (patch)
tree86c967eeb773ae46c191ae3dde1a02a89ca4b1b5 /doc
parentdfbc6c65f665f5c550581b77aeb7c308181fd8d8 (diff)
parent199e65a6c5584dfcdd24d6885dd9b19bf0af953a (diff)
merge changes for storm-2015
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 5043c9febb..47b9bcf32a 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -693,6 +693,7 @@ Jonathan Yap
STORM-1987
STORM-1986
STORM-1981
+ STORM-2015
Kadah Coba
STORM-1060
STORM-1843