diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-02-09 21:55:14 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-02-09 22:33:52 +0200 |
| commit | 6c54c9f8a9e11ba3c00c0ac38c4bb8d3610ccc58 (patch) | |
| tree | 1ab66f72ba68c72218ab67142567744aef6843c1 /doc | |
| parent | 8e03f926c787d02d0860a75e9e8fe0f9013df003 (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/contributions.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index c6c7ea8f53..a47c7b78f9 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -282,6 +282,7 @@ Beq Janus SL-11300 SL-15709 SL-16021 + SL-18592 SL-18637 Beth Walcher Bezilon Kasei @@ -373,6 +374,7 @@ Charlie Sazaland Chaser Zaks BUG-225599 BUG-227485 + SL-16874 Cherry Cheevers ChickyBabes Zuzu Chorazin Allen @@ -1389,6 +1391,7 @@ Sovereign Engineer OPEN-343 SL-11625 BUG-229030 + SL-14696 SL-14705 SL-14706 SL-14707 @@ -1396,6 +1399,12 @@ Sovereign Engineer SL-14732 SL-15096 SL-16127 + SL-18249 + SL-18394 + SL-18412 + SL-18497 + SL-18525 + SL-18534 SpacedOut Frye VWR-34 VWR-45 @@ -1658,6 +1667,8 @@ Zi Ree VWR-25588 STORM-1790 STORM-1842 + SL-18348 + SL-18593 Zipherius Turas VWR-76 VWR-77 |