diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:51:21 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:51:21 +0300 |
| commit | d9153532b8637cbfe992200effb1d24c597a732f (patch) | |
| tree | 123a168e400480ce9a8de780e068c232172c85cc /doc | |
| parent | b06a99f7c76950484972e25d9dbbee8660a6a6c3 (diff) | |
| parent | bb3c36f5cbc0c3b542045fd27255eee24e03da22 (diff) | |
Merge branch 'main' into marchcat/x-mf-merge
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 15aec5e282..024ca90d2f 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -245,7 +245,8 @@ Ansariel Hiller SL-19623 SL-4126 SL-20224 - https://github.com/secondlife/viewer/issues/1051 + SL-20524 + secondlife/viewer#1051 Aralara Rajal Arare Chantilly CHUIBUG-191 @@ -389,6 +390,7 @@ Chaser Zaks BUG-225599 BUG-227485 SL-16874 + SL-20442 Cherry Cheevers ChickyBabes Zuzu Chorazin Allen |