diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-26 16:43:58 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-26 16:43:58 -0400 |
commit | 74d4f8af01358c0975351f90f044c03bc9c50c4c (patch) | |
tree | 72b8f043cd5787409718d1ca7be21ec32cf10657 /doc/contributions.txt | |
parent | 52411f83a1e92d8449f68a6528f5b78e7c391553 (diff) | |
parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) |
v-r to drano merge conflicts wip
Diffstat (limited to 'doc/contributions.txt')
-rw-r--r-- | doc/contributions.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 04edfb4bea..18df538d2a 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1160,9 +1160,9 @@ Tofu Buzzard CTS-411 STORM-546 VWR-24509 - STORM-1684 SH-2477 STORM-1684 + STORM-1819 Tony Kembia Torben Trautman TouchaHoney Perhaps |