summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-10 15:46:49 -0400
committerOz Linden <oz@lindenlab.com>2014-03-10 15:46:49 -0400
commit2b4d3fff706d098076bb6c0a7dce2ca35b83300f (patch)
tree68f8adf2151b2acab4c561048fa13a52a997e6e5 /doc
parent208d9a2d21d380a33ce8f1a5a75813222965f62e (diff)
back out STORM-2011 due to conflict
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 16cb5c526c..f4e5ad6edb 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -180,7 +180,6 @@ Ansariel Hiller
MAINT-2368
STORM-1931
MAINT-2773
- STORM-2011
MAINT-3187
BUG-3764
STORM-1984