diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 15:13:07 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-10 15:13:07 -0700 |
| commit | e413f4b335a2f4f5a1ca151c8ab67324a72ebaee (patch) | |
| tree | 23c5343dea45f63ca2069d28d782614fd2bc6698 /doc | |
| parent | 6074f65991f4a9e928ef9609e90d8e9570350e63 (diff) | |
Fixup merge diffs
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index d7f050a916..33cf0a422e 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -647,6 +647,7 @@ Jonathan Yap STORM-1872 STORM-1858 STORM-1862 + OPEN-161 Kadah Coba STORM-1060 STORM-1843 @@ -1168,6 +1169,7 @@ Techwolf Lupindo SNOW-746 VWR-12385 VWR-20893 + OPEN-161 Templar Merlin tenebrous pau VWR-247 |