diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 22:04:40 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-02-05 22:04:40 +0200 |
commit | e3e1672ac40dd4f1f4e458ed09cd7279f0a45fc3 (patch) | |
tree | 8e64e6074c11005fbb1dac606c176e4470de03e4 /doc/contributions.txt | |
parent | aa52c852d600aa6b2ea17cdd86f53972c95cca4a (diff) | |
parent | 6762f60d78277cf27afd8353aa531afb26bd560c (diff) |
Merge branch 'DRTVWR-599-maint-Z' into release/maint-yz
# Conflicts:
# indra/newview/llchiclet.h
Diffstat (limited to 'doc/contributions.txt')
-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 14d85b5e23..160e6386e6 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -64,6 +64,8 @@ Aimee Trescothick VWR-14711 VWR-14712 VWR-15454 +AiraYumi + SL-20781 (github PR #613) Alejandro Rosenthal VWR-1184 Aleric Inglewood |