summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-01-22 17:14:13 -0500
committerOz Linden <oz@lindenlab.com>2014-01-22 17:14:13 -0500
commitc241bb2af865370475308198ce6421900c92e345 (patch)
tree68b448b177e544af03f4d8cdbf9c6800739a67e9 /doc
parentd8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff)
parentcda6e4488a6c87c47add50b4c7aa5ffd1303478d (diff)
merge changes for storm-1972
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 2f9d0c2c86..a93816bd57 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1140,6 +1140,7 @@ snowy Sidran
Sovereign Engineer
MAINT-2334
OPEN-189
+ STORM-1972
SpacedOut Frye
VWR-34
VWR-45