summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-10-14 11:58:35 -0500
committerDave Parks <davep@lindenlab.com>2011-10-14 11:58:35 -0500
commitc0ca8e5e2e4d3f591db3175f09c0b64b6b2e10c5 (patch)
tree28ea7a212319b0bd452c68e54f374904bfe6ed8a /doc
parentfc2929bf4f6366c3a3386e4b79b0fda7bd0466ba (diff)
parent4331c112aba074562e9a8826fe6d271a94f790f0 (diff)
Merge backout of b782a75c99e6
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index bcdc5a63d2..ec24b7f2a6 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -65,15 +65,11 @@ Aimee Trescothick
Alejandro Rosenthal
VWR-1184
Aleric Inglewood
- SNOW-84
SNOW-240
- SNOW-477
SNOW-522
SNOW-626
- SNOW-744
SNOW-756
SNOW-764
- SNOW-766
SNOW-800
VWR-10001
VWR-10579
@@ -99,8 +95,11 @@ Aleric Inglewood
VWR-24366
VWR-24519
VWR-24520
+ SNOW-84
+ SNOW-477
+ SNOW-744
+ SNOW-766
STORM-163
- STORM-864
STORM-955
STORM-960
Ales Beaumont